commit aa5d9c30f8903d98f4b25cebdcfdbae19ca55859 · pyrox.dev/nixpkgs

+2 -2

nixos/modules/system/boot/systemd/initrd.nix

···

       473
        
               "${cfg.package.util-linux}/bin/umount"

     

       474
        
               "${cfg.package.util-linux}/bin/sulogin"

     

       475
        
       

     

       476
       -
               # required for script services

     

       477
       -
               "${pkgs.runtimeShell}"

     

       478
        
       

     

       479
        
               # so NSS can look up usernames

     

       480
        
               "${pkgs.glibc}/lib/libnss_files.so.2"

···

       473
        
               "${cfg.package.util-linux}/bin/umount"

     

       474
        
               "${cfg.package.util-linux}/bin/sulogin"

     

       475
        
       

     

       476
       +
               # required for script services, and some tools like xfs still want the sh symlink

     

       477
       +
               "${pkgs.bash}/bin"

     

       478
        
       

     

       479
        
               # so NSS can look up usernames

     

       480
        
               "${pkgs.glibc}/lib/libnss_files.so.2"

+1 -1

nixos/tests/installer-systemd-stage-1.nix

···

       19
        
           luksroot

     

       20
        
           luksroot-format1

     

       21
        
           luksroot-format2

     

       22
       -
           # lvm

     

       23
        
           separateBoot

     

       24
        
           separateBootFat

     

       25
        
           separateBootZfs

···

       19
        
           luksroot

     

       20
        
           luksroot-format1

     

       21
        
           luksroot-format2

     

       22
       +
           lvm

     

       23
        
           separateBoot

     

       24
        
           separateBootFat

     

       25
        
           separateBootZfs

+3

nixos/tests/installer.nix

···

       974
        
                 "mount LABEL=nixos /mnt",

     

       975
        
             )

     

       976
        
           '';

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       977
        
         };

     

       978
        
       

     

       979
        
         # Boot off an encrypted root partition with the default LUKS header format

···

       974
        
                 "mount LABEL=nixos /mnt",

     

       975
        
             )

     

       976
        
           '';

     

       977
       +
           extraConfig = optionalString systemdStage1 ''

     

       978
       +
             boot.initrd.services.lvm.enable = true;

     

       979
       +
           '';

     

       980
        
         };

     

       981
        
       

     

       982
        
         # Boot off an encrypted root partition with the default LUKS header format