diff options
author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2012-08-14 16:45:50 -0400 |
---|---|---|
committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2012-08-14 16:45:50 -0400 |
commit | 4475294f575865fe7fefb8a8d5c3a94f6141550b (patch) | |
tree | 74edb83536e006382f598c939e61428297978334 /modules/system | |
parent | 88bfdca8e02ed93079f8159dcc63ab61372b56dc (diff) | |
download | nixpkgs-4475294f575865fe7fefb8a8d5c3a94f6141550b.tar nixpkgs-4475294f575865fe7fefb8a8d5c3a94f6141550b.tar.gz nixpkgs-4475294f575865fe7fefb8a8d5c3a94f6141550b.tar.bz2 nixpkgs-4475294f575865fe7fefb8a8d5c3a94f6141550b.tar.lz nixpkgs-4475294f575865fe7fefb8a8d5c3a94f6141550b.tar.xz nixpkgs-4475294f575865fe7fefb8a8d5c3a94f6141550b.tar.zst nixpkgs-4475294f575865fe7fefb8a8d5c3a94f6141550b.zip |
Fix a hang during shutdown
Subtle: dhcpcd.service would call resolvconf during shutdown, which in turn would start invalidate-nscd.service, causing the shutdown to be cancelled. Instead, give nscd.service a proper reload action, and do "systemctl reload --no-block nscd.service". The --no-block is necessary to prevent that command from waiting until a timeout occurs (bug in systemd?).
Diffstat (limited to 'modules/system')
-rw-r--r-- | modules/system/boot/shutdown.nix | 2 | ||||
-rw-r--r-- | modules/system/boot/stage-2-init.sh | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/modules/system/boot/shutdown.nix b/modules/system/boot/shutdown.nix index 1335429b669..3fb9545b33f 100644 --- a/modules/system/boot/shutdown.nix +++ b/modules/system/boot/shutdown.nix @@ -21,5 +21,5 @@ with pkgs.lib; ExecStart=${pkgs.utillinux}/sbin/hwclock --systohc ${if config.time.hardwareClockInLocalTime then "--localtime" else "--utc"} ''; }; - + } diff --git a/modules/system/boot/stage-2-init.sh b/modules/system/boot/stage-2-init.sh index e8b01788900..80aff11b34b 100644 --- a/modules/system/boot/stage-2-init.sh +++ b/modules/system/boot/stage-2-init.sh @@ -179,4 +179,4 @@ fi echo "starting systemd..." PATH=/run/current-system/systemd/lib/systemd \ MODULE_DIR=/run/current-system/kernel-modules/lib/modules \ - exec systemd --log-target journal # --log-level debug --crash-shell + exec systemd --log-target=journal # --log-level=debug --log-target=console --crash-shell |