diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-05-21 15:19:01 +0200 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-05-21 15:55:50 +0200 |
| commit | c54eb790633c85bc22c4328e0f035cfa0be06780 (patch) | |
| tree | 9c45eba03241d7a5d04d34646f4e916b4424184f /nixos/modules/system | |
| parent | 5e364503d5b219e81c54e3616e3bf8e61a2cf1c7 (diff) | |
| download | nixlib-c54eb790633c85bc22c4328e0f035cfa0be06780.tar nixlib-c54eb790633c85bc22c4328e0f035cfa0be06780.tar.gz nixlib-c54eb790633c85bc22c4328e0f035cfa0be06780.tar.bz2 nixlib-c54eb790633c85bc22c4328e0f035cfa0be06780.tar.lz nixlib-c54eb790633c85bc22c4328e0f035cfa0be06780.tar.xz nixlib-c54eb790633c85bc22c4328e0f035cfa0be06780.tar.zst nixlib-c54eb790633c85bc22c4328e0f035cfa0be06780.zip | |
Don't kill unionfs-fuse during shutdown
Killing the daemon backing /nix/store prevents a clean shutdown. See http://www.freedesktop.org/wiki/Software/systemd/RootStorageDaemons/
Diffstat (limited to 'nixos/modules/system')
| -rw-r--r-- | nixos/modules/system/boot/stage-1-init.sh | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/nixos/modules/system/boot/stage-1-init.sh b/nixos/modules/system/boot/stage-1-init.sh index c4a21b02cac3..15586e68e7e5 100644 --- a/nixos/modules/system/boot/stage-1-init.sh +++ b/nixos/modules/system/boot/stage-1-init.sh @@ -58,6 +58,7 @@ echo mkdir -p /etc touch /etc/fstab # to shut up mount touch /etc/mtab # to shut up mke2fs +touch /etc/initrd-release mkdir -p /proc mount -t proc none /proc mkdir -p /sys @@ -345,8 +346,8 @@ exec 3>&- udevadm control --exit || true # Kill any remaining processes, just to be sure we're not taking any -# with us into stage 2. unionfs-fuse mounts require the unionfs process. -pkill -9 -v '(1|unionfs)' +# with us into stage 2. But keep storage daemons like unionfs-fuse. +pkill -9 -v -f '@' if test -n "$debug1mounts"; then fail; fi |