diff options
author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-04-24 22:46:26 +0200 |
---|---|---|
committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-04-24 23:18:16 +0200 |
commit | d7a7f80aff92224351ded6e87897ba5286d9f819 (patch) | |
tree | 3289ae754b10d29b645057fcb6da901230b895e3 | |
parent | 2c70276d96fa911ecfcadbbd25837392d53fd81f (diff) | |
download | nixlib-d7a7f80aff92224351ded6e87897ba5286d9f819.tar nixlib-d7a7f80aff92224351ded6e87897ba5286d9f819.tar.gz nixlib-d7a7f80aff92224351ded6e87897ba5286d9f819.tar.bz2 nixlib-d7a7f80aff92224351ded6e87897ba5286d9f819.tar.lz nixlib-d7a7f80aff92224351ded6e87897ba5286d9f819.tar.xz nixlib-d7a7f80aff92224351ded6e87897ba5286d9f819.tar.zst nixlib-d7a7f80aff92224351ded6e87897ba5286d9f819.zip |
cups: Start after network.target
http://hydra.nixos.org/build/10661709
-rw-r--r-- | nixos/modules/services/printing/cupsd.nix | 5 | ||||
-rw-r--r-- | nixos/tests/printing.nix | 2 |
2 files changed, 3 insertions, 4 deletions
diff --git a/nixos/modules/services/printing/cupsd.nix b/nixos/modules/services/printing/cupsd.nix index 4b758608cb64..edbba7e0a834 100644 --- a/nixos/modules/services/printing/cupsd.nix +++ b/nixos/modules/services/printing/cupsd.nix @@ -126,7 +126,8 @@ in { description = "CUPS Printing Daemon"; wantedBy = [ "multi-user.target" ]; - after = [ "network-interfaces.target" ]; + wants = [ "network.target" ]; + after = [ "network.target" ]; path = [ cups ]; @@ -145,7 +146,7 @@ in services.printing.drivers = [ pkgs.cups pkgs.cups_pdf_filter pkgs.ghostscript additionalBackends pkgs.perl pkgs.coreutils pkgs.gnused pkgs.bc pkgs.gawk pkgs.gnugrep - ]; + ]; services.printing.cupsdConf = '' diff --git a/nixos/tests/printing.nix b/nixos/tests/printing.nix index 9b96e3d7b20c..9ef28dcfcd4d 100644 --- a/nixos/tests/printing.nix +++ b/nixos/tests/printing.nix @@ -31,9 +31,7 @@ import ./make-test.nix ({pkgs, ... }: { # Make sure that cups is up on both sides. $server->waitForUnit("cupsd.service"); - $server->waitForUnit("network.target"); $client->waitForUnit("cupsd.service"); - $client->waitForUnit("network.target"); $client->succeed("lpstat -r") =~ /scheduler is running/ or die; $client->succeed("lpstat -H") =~ "/var/run/cups/cups.sock" or die; $client->succeed("curl --fail http://localhost:631/"); |