movefasta/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-07-14 06:00:33 +03:00
Code Activity

nixos/nfs: Fix dependency ordering

Browse source
This commit is contained in:
William A. Kennington III 2014-12-01 17:17:46 -08:00
parent 1716c12b54
commit 2b06a92c2a
3 changed files with 11 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

5
nixos/modules/system/boot/systemd.nix
View file

@ -947,6 +947,11 @@ in
systemd.targets.network-online.after = [ "ip-up.target" ]; systemd.targets.network-online.after = [ "ip-up.target" ];
systemd.targets.remote-fs-pre = {
wantedBy = [ "remote-fs.target" ];
before = [ "remote-fs.target" ];
};
systemd.units = systemd.units =
mapAttrs' (n: v: nameValuePair "${n}.target" (targetToUnit n v)) cfg.targets mapAttrs' (n: v: nameValuePair "${n}.target" (targetToUnit n v)) cfg.targets
// mapAttrs' (n: v: nameValuePair "${n}.service" (serviceToUnit n v)) cfg.services // mapAttrs' (n: v: nameValuePair "${n}.service" (serviceToUnit n v)) cfg.services

8
nixos/modules/tasks/filesystems/nfs.nix
View file

@ -73,9 +73,10 @@ in
path = [ pkgs.nfsUtils pkgs.sysvtools pkgs.utillinux ]; path = [ pkgs.nfsUtils pkgs.sysvtools pkgs.utillinux ];
wantedBy = [ "multi-user.target" ]; wantedBy = [ "remote-fs-pre.target" ];
before = [ "remote-fs-pre.target" ];
requires = [ "basic.target" "rpcbind.service" ]; requires = [ "basic.target" "rpcbind.service" ];
after = [ "basic.target" "rpcbind.service" "network.target" ]; after = [ "basic.target" "rpcbind.service" ];
unitConfig.DefaultDependencies = false; # don't stop during shutdown unitConfig.DefaultDependencies = false; # don't stop during shutdown
@ -99,7 +100,8 @@ in
path = [ pkgs.sysvtools pkgs.utillinux ]; path = [ pkgs.sysvtools pkgs.utillinux ];
wantedBy = [ "multi-user.target" ]; wantedBy = [ "remote-fs-pre.target" ];
before = [ "remote-fs-pre.target" ];
requires = [ "rpcbind.service" ]; requires = [ "rpcbind.service" ];
after = [ "rpcbind.service" ]; after = [ "rpcbind.service" ];

2
nixos/tests/nfs.nix
View file

@ -38,7 +38,7 @@ in
testScript = testScript =
'' ''
$server->waitForUnit("nfsd"); $server->waitForUnit("nfsd");
$server->waitForUnit("network.target"); $server->waitForUnit("network-online.target");
startAll; startAll;