gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
nixos/systemd-stage-1: Fix fsck.xfs needing bash's sh symlink
This commit is contained in:
Pol Dellaiera
2024-05-18 23:57:04 +02:00
committed by GitHub
parent 8ee3dcb13c da635f35de
commit aa5d9c30f8
3 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
nixos/modules/system/boot/systemd/initrd.nix
View File

@@ -473,8 +473,8 @@ in {
"${cfg.package.util-linux}/bin/umount" "${cfg.package.util-linux}/bin/umount"
"${cfg.package.util-linux}/bin/sulogin" "${cfg.package.util-linux}/bin/sulogin"
# required for script services # required for script services, and some tools like xfs still want the sh symlink
"${pkgs.runtimeShell}" "${pkgs.bash}/bin"
# so NSS can look up usernames # so NSS can look up usernames
"${pkgs.glibc}/lib/libnss_files.so.2" "${pkgs.glibc}/lib/libnss_files.so.2"

2
nixos/tests/installer-systemd-stage-1.nix
View File

@@ -19,7 +19,7 @@
luksroot luksroot
luksroot-format1 luksroot-format1
luksroot-format2 luksroot-format2
# lvm lvm
separateBoot separateBoot
separateBootFat separateBootFat
separateBootZfs separateBootZfs

3
nixos/tests/installer.nix
View File

@@ -974,6 +974,9 @@ in {
"mount LABEL=nixos /mnt", "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 # Boot off an encrypted root partition with the default LUKS header format