Merge pull request #309236 from ElvishJerricco/sd-s1-fix-xfs-fsck

nixos/systemd-stage-1: Fix fsck.xfs needing bash's sh symlink

Changed files
+6 -3
nixos
modules
system
boot
systemd
tests
+2 -2
nixos/modules/system/boot/systemd/initrd.nix
···
"${cfg.package.util-linux}/bin/umount"
"${cfg.package.util-linux}/bin/sulogin"
-
# required for script services
-
"${pkgs.runtimeShell}"
# so NSS can look up usernames
"${pkgs.glibc}/lib/libnss_files.so.2"
···
"${cfg.package.util-linux}/bin/umount"
"${cfg.package.util-linux}/bin/sulogin"
+
# required for script services, and some tools like xfs still want the sh symlink
+
"${pkgs.bash}/bin"
# so NSS can look up usernames
"${pkgs.glibc}/lib/libnss_files.so.2"
+1 -1
nixos/tests/installer-systemd-stage-1.nix
···
luksroot
luksroot-format1
luksroot-format2
-
# lvm
separateBoot
separateBootFat
separateBootZfs
···
luksroot
luksroot-format1
luksroot-format2
+
lvm
separateBoot
separateBootFat
separateBootZfs
+3
nixos/tests/installer.nix
···
"mount LABEL=nixos /mnt",
)
'';
};
# Boot off an encrypted root partition with the default LUKS header format
···
"mount LABEL=nixos /mnt",
)
'';
+
extraConfig = optionalString systemdStage1 ''
+
boot.initrd.services.lvm.enable = true;
+
'';
};
# Boot off an encrypted root partition with the default LUKS header format