diff options
author | Matt McHenry <github@matt.mchenryfamily.org> | 2018-08-21 21:39:27 -0400 |
---|---|---|
committer | Robin Gloster <mail@glob.in> | 2018-08-28 17:12:49 +0200 |
commit | 94a906b59a7c73f6a0b6ef120f89ee0f927f0dc9 (patch) | |
tree | 5607fda8ea37abcf44ae1b23ec211757a1ba3cd9 /nixos/modules | |
parent | 69b4f427b67fe83ddb2bb3ee113770aa802e5643 (diff) | |
download | nixlib-94a906b59a7c73f6a0b6ef120f89ee0f927f0dc9.tar nixlib-94a906b59a7c73f6a0b6ef120f89ee0f927f0dc9.tar.gz nixlib-94a906b59a7c73f6a0b6ef120f89ee0f927f0dc9.tar.bz2 nixlib-94a906b59a7c73f6a0b6ef120f89ee0f927f0dc9.tar.lz nixlib-94a906b59a7c73f6a0b6ef120f89ee0f927f0dc9.tar.xz nixlib-94a906b59a7c73f6a0b6ef120f89ee0f927f0dc9.tar.zst nixlib-94a906b59a7c73f6a0b6ef120f89ee0f927f0dc9.zip |
systemd: ensure fsck Requires/After links are created in mount units
systemd-fsck-generator only produces these lines if it can find the necessary fsck executable in its PATH. fixes #29139.
Diffstat (limited to 'nixos/modules')
-rw-r--r-- | nixos/modules/system/boot/stage-2-init.sh | 2 | ||||
-rw-r--r-- | nixos/modules/system/boot/stage-2.nix | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/nixos/modules/system/boot/stage-2-init.sh b/nixos/modules/system/boot/stage-2-init.sh index b83012dfda7e..49764b75a557 100644 --- a/nixos/modules/system/boot/stage-2-init.sh +++ b/nixos/modules/system/boot/stage-2-init.sh @@ -159,6 +159,6 @@ exec {logOutFd}>&- {logErrFd}>&- # Start systemd. echo "starting systemd..." -PATH=/run/current-system/systemd/lib/systemd \ +PATH=/run/current-system/systemd/lib/systemd:@fsPackagesPath@ \ LOCALE_ARCHIVE=/run/current-system/sw/lib/locale/locale-archive \ exec systemd diff --git a/nixos/modules/system/boot/stage-2.nix b/nixos/modules/system/boot/stage-2.nix index 9fd89b6319db..55e6b19c67fd 100644 --- a/nixos/modules/system/boot/stage-2.nix +++ b/nixos/modules/system/boot/stage-2.nix @@ -17,6 +17,7 @@ let pkgs.utillinux pkgs.openresolv ]; + fsPackagesPath = lib.makeBinPath config.system.fsPackages; postBootCommands = pkgs.writeText "local-cmds" '' ${config.boot.postBootCommands} |