public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

cups: Start after network.target

Browse Source 
http://hydra.nixos.org/build/10661709
This commit is contained in:
Eelco Dolstra 2014-04-24 22:46:26 +02:00
parent 2c70276d96
commit d7a7f80aff
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
nixos/modules/services/printing/cupsd.nix
View File

@ -126,7 +126,8 @@ in
{ description = "CUPS Printing Daemon"; { description = "CUPS Printing Daemon";
wantedBy = [ "multi-user.target" ]; wantedBy = [ "multi-user.target" ];
after = [ "network-interfaces.target" ]; wants = [ "network.target" ];
after = [ "network.target" ];
path = [ cups ]; path = [ cups ];
@ -145,7 +146,7 @@ in
services.printing.drivers = services.printing.drivers =
[ pkgs.cups pkgs.cups_pdf_filter pkgs.ghostscript additionalBackends [ pkgs.cups pkgs.cups_pdf_filter pkgs.ghostscript additionalBackends
pkgs.perl pkgs.coreutils pkgs.gnused pkgs.bc pkgs.gawk pkgs.gnugrep pkgs.perl pkgs.coreutils pkgs.gnused pkgs.bc pkgs.gawk pkgs.gnugrep
]; ];
services.printing.cupsdConf = services.printing.cupsdConf =
'' ''

2
nixos/tests/printing.nix
View File

@ -31,9 +31,7 @@ import ./make-test.nix ({pkgs, ... }: {
# Make sure that cups is up on both sides. # Make sure that cups is up on both sides.
$server->waitForUnit("cupsd.service"); $server->waitForUnit("cupsd.service");
$server->waitForUnit("network.target");
$client->waitForUnit("cupsd.service"); $client->waitForUnit("cupsd.service");
$client->waitForUnit("network.target");
$client->succeed("lpstat -r") =~ /scheduler is running/ or die; $client->succeed("lpstat -r") =~ /scheduler is running/ or die;
$client->succeed("lpstat -H") =~ "/var/run/cups/cups.sock" or die; $client->succeed("lpstat -H") =~ "/var/run/cups/cups.sock" or die;
$client->succeed("curl --fail http://localhost:631/"); $client->succeed("curl --fail http://localhost:631/");