commit 4868649f037c4fe80034f281212b8ccd2d0ac148 · pyrox.dev/nixpkgs

+3 -3

nixos/maintainers/scripts/ec2/amazon-hvm-install-config.nix

···

       23
        
         boot.kernelParams = [ "console=ttyS0" ];

     

       24
        
       

     

       25
        
         boot.initrd.extraUtilsCommands = ''

     

       26
       -
           cp -v ${pkgs.gawk}/bin/gawk $out/bin/gawk

     

       27
       -
           cp -v ${pkgs.gnused}/bin/sed $out/bin/gnused

     

       28
       -
           cp -v ${pkgs.utillinux}/sbin/sfdisk $out/bin/sfdisk

     

       29
        
           cp -v ${growpart} $out/bin/growpart

     

       30
        
         '';

     

       31
        
         boot.initrd.postDeviceCommands = ''

···

       23
        
         boot.kernelParams = [ "console=ttyS0" ];

     

       24
        
       

     

       25
        
         boot.initrd.extraUtilsCommands = ''

     

       26
       +
           copy_bin_and_libs ${pkgs.gawk}/bin/gawk

     

       27
       +
           copy_bin_and_libs ${pkgs.gnused}/bin/sed

     

       28
       +
           copy_bin_and_libs ${pkgs.utillinux}/sbin/sfdisk

     

       29
        
           cp -v ${growpart} $out/bin/growpart

     

       30
        
         '';

     

       31
        
         boot.initrd.postDeviceCommands = ''

+1 -1

nixos/modules/installer/cd-dvd/system-tarball-sheevaplug.nix

···

       98
        
       

     

       99
        
         boot.initrd.extraUtilsCommands =

     

       100
        
           ''

     

       101
       -
             cp ${pkgs.utillinux}/sbin/hwclock $out/bin

     

       102
        
           '';

     

       103
        
       

     

       104
        
         boot.initrd.postDeviceCommands =

···

       98
        
       

     

       99
        
         boot.initrd.extraUtilsCommands =

     

       100
        
           ''

     

       101
       +
             copy_bin_and_libs ${pkgs.utillinux}/sbin/hwclock

     

       102
        
           '';

     

       103
        
       

     

       104
        
         boot.initrd.postDeviceCommands =

+9 -19

nixos/modules/system/boot/luksroot.nix

···

       405
        
       

     

       406
        
           # copy the cryptsetup binary and it's dependencies

     

       407
        
           boot.initrd.extraUtilsCommands = ''

     

       408
       -
             cp -pdv ${pkgs.cryptsetup}/sbin/cryptsetup $out/bin

     

       409
       -
       

     

       410
       -
             cp -pdv ${pkgs.libgcrypt_1_6}/lib/libgcrypt*.so.* $out/lib

     

       411
       -
             cp -pdv ${pkgs.libgpgerror}/lib/libgpg-error*.so.* $out/lib

     

       412
       -
             cp -pdv ${pkgs.cryptsetup}/lib/libcryptsetup*.so.* $out/lib

     

       413
       -
             cp -pdv ${pkgs.popt}/lib/libpopt*.so.* $out/lib

     

       414
        
       

     

       415
        
             ${optionalString luks.yubikeySupport ''

     

       416
       -
             cp -pdv ${pkgs.ykpers}/bin/ykchalresp $out/bin

     

       417
       -
             cp -pdv ${pkgs.ykpers}/bin/ykinfo $out/bin

     

       418
       -
             cp -pdv ${pkgs.openssl}/bin/openssl $out/bin

     

       419
       -
       

     

       420
       -
             cc -O3 -I${pkgs.openssl}/include -L${pkgs.openssl}/lib ${./pbkdf2-sha512.c} -o $out/bin/pbkdf2-sha512 -lcrypto

     

       421
       -
             strip -s $out/bin/pbkdf2-sha512

     

       422
        
       

     

       423
       -
             cp -pdv ${pkgs.libusb1}/lib/libusb*.so.* $out/lib

     

       424
       -
             cp -pdv ${pkgs.ykpers}/lib/libykpers*.so.* $out/lib

     

       425
       -
             cp -pdv ${pkgs.libyubikey}/lib/libyubikey*.so.* $out/lib

     

       426
       -
             cp -pdv ${pkgs.openssl}/lib/libssl*.so.* $out/lib

     

       427
       -
             cp -pdv ${pkgs.openssl}/lib/libcrypto*.so.* $out/lib

     

       428
        
       

     

       429
       -
             mkdir -p $out/etc/ssl

     

       430
       -
             cp -pdv ${pkgs.openssl}/etc/ssl/openssl.cnf $out/etc/ssl

     

       431
        
       

     

       432
        
             cat > $out/bin/openssl-wrap <<EOF

     

       433
        
       #!$out/bin/sh

···

       405
        
       

     

       406
        
           # copy the cryptsetup binary and it's dependencies

     

       407
        
           boot.initrd.extraUtilsCommands = ''

     

       408
       +
             copy_bin_and_libs ${pkgs.cryptsetup}/bin/cryptsetup

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       409
        
       

     

       410
        
             ${optionalString luks.yubikeySupport ''

     

       411
       +
               copy_bin_and_libs ${pkgs.ykpers}/bin/ykchalresp

     

       412
       +
               copy_bin_and_libs ${pkgs.ykpers}/bin/ykinfo

     

       413
       +
               copy_bin_and_libs ${pkgs.openssl}/bin/openssl

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       414
        
       

     

       415
       +
               cc -O3 -I${pkgs.openssl}/include -L${pkgs.openssl}/lib ${./pbkdf2-sha512.c} -o pbkdf2-sha512 -lcrypto

     

       416
       +
               strip -s pbkdf2-sha512

     

       417
       +
               copy_bin_and_libs pbkdf2-sha512

     

       0
        
       
     

       0
        
       
     

       418
        
       

     

       419
       +
               mkdir -p $out/etc/ssl

     

       420
       +
               cp -pdv ${pkgs.openssl}/etc/ssl/openssl.cnf $out/etc/ssl

     

       421
        
       

     

       422
        
             cat > $out/bin/openssl-wrap <<EOF

     

       423
        
       #!$out/bin/sh

+35 -23

nixos/modules/system/boot/stage-1.nix

···

       39
        
             mkdir -p $out/bin $out/lib

     

       40
        
             ln -s $out/bin $out/sbin

     

       41
        
       

     

       42
       -
             # Copy what we need from Glibc.

     

       43
        
             cp -pv ${pkgs.glibc}/lib/ld*.so.? $out/lib

     

       44
       -
             cp -pv ${pkgs.glibc}/lib/libc.so.* $out/lib

     

       45
       -
             cp -pv ${pkgs.glibc}/lib/libm.so.* $out/lib

     

       46
       -
             cp -pv ${pkgs.glibc}/lib/libpthread.so.* $out/lib

     

       47
       -
             cp -pv ${pkgs.glibc}/lib/librt.so.* $out/lib

     

       48
       -
             cp -pv ${pkgs.glibc}/lib/libdl.so.* $out/lib

     

       49
       -
             cp -pv ${pkgs.gcc.cc}/lib*/libgcc_s.so.* $out/lib

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       50
        
       

     

       51
        
             # Copy BusyBox.

     

       52
       -
             cp -pvd ${pkgs.busybox}/bin/* ${pkgs.busybox}/sbin/* $out/bin/

     

       0
        
       
     

       0
        
       
     

       53
        
       

     

       54
        
             # Copy some utillinux stuff.

     

       55
       -
             cp -vf --remove-destination ${pkgs.utillinux}/sbin/blkid $out/bin

     

       56
       -
             cp -pdv ${pkgs.utillinux}/lib/libblkid*.so.* $out/lib

     

       57
       -
             cp -pdv ${pkgs.utillinux}/lib/libuuid*.so.* $out/lib

     

       58
        
       

     

       59
        
             # Copy dmsetup and lvm.

     

       60
       -
             cp -v ${pkgs.lvm2}/sbin/dmsetup $out/bin/dmsetup

     

       61
       -
             cp -v ${pkgs.lvm2}/sbin/lvm $out/bin/lvm

     

       62
       -
             cp -v ${pkgs.lvm2}/lib/libdevmapper.so.*.* $out/lib

     

       63
       -
             cp -v ${pkgs.systemd}/lib/libsystemd.so.* $out/lib

     

       64
        
       

     

       65
        
             # Add RAID mdadm tool.

     

       66
       -
             cp -v ${pkgs.mdadm}/sbin/mdadm $out/bin/mdadm

     

       67
        
       

     

       68
        
             # Copy udev.

     

       69
       -
             cp -v ${udev}/lib/systemd/systemd-udevd ${udev}/bin/udevadm $out/bin

     

       70
       -
             cp -v ${udev}/lib/udev/*_id $out/bin

     

       71
       -
             cp -pdv ${udev}/lib/libudev.so.* $out/lib

     

       72
       -
             cp -v ${pkgs.kmod}/lib/libkmod.so.* $out/lib

     

       73
       -
             cp -v ${pkgs.acl}/lib/libacl.so.* $out/lib

     

       74
       -
             cp -v ${pkgs.attr}/lib/libattr.so.* $out/lib

     

       75
        
       

     

       76
        
             # Copy modprobe.

     

       77
       -
             cp -v ${pkgs.kmod}/bin/kmod $out/bin/

     

       78
        
             ln -sf kmod $out/bin/modprobe

     

       79
        
       

     

       80
        
             ${config.boot.initrd.extraUtilsCommands}

     
···

       101
        
             $out/bin/ash -c 'echo hello world' | grep "hello world"

     

       102
        
             export LD_LIBRARY_PATH=$out/lib

     

       103
        
             $out/bin/mount --help 2>&1 | grep "BusyBox"

     

       0
        
       
     

       104
        
             $out/bin/udevadm --version

     

       105
        
             $out/bin/dmsetup --version 2>&1 | tee -a log | grep "version:"

     

       106
        
             LVM_SYSTEM_DIR=$out $out/bin/lvm version 2>&1 | tee -a log | grep "LVM"

···

       39
        
             mkdir -p $out/bin $out/lib

     

       40
        
             ln -s $out/bin $out/sbin

     

       41
        
       

     

       42
       +
             # Copy ld manually since it isn't detected correctly

     

       43
        
             cp -pv ${pkgs.glibc}/lib/ld*.so.? $out/lib

     

       44
       +
       

     

       45
       +
             copy_bin_and_libs () {

     

       46
       +
               [ -f "$out/bin/$(basename $1)" ] && return 0

     

       47
       +
               cp -pdv $1 $out/bin

     

       48
       +
               LDD="$(ldd $1)"

     

       49
       +
               [ "$?" -eq "1" ] && return 0

     

       50
       +
               LIBS="$(echo "$LDD" | awk '{print $3}' | sed '/^$/d')"

     

       51
       +
               for LIB in $LIBS; do

     

       52
       +
                 [ ! -f "$out/lib/$(basename $LIB)" ] && cp -pdv $LIB $out/lib

     

       53
       +
                 while [ "$(readlink $LIB)" != "" ]; do

     

       54
       +
                   LINK="$(readlink $LIB)"

     

       55
       +
                   if [ "${LINK:0:1}" != "/" ]; then

     

       56
       +
                     LINK="$(dirname $LIB)/$LINK"

     

       57
       +
                   fi

     

       58
       +
                   LIB="$LINK"

     

       59
       +
                   [ ! -f "$out/lib/$(basename $LIB)" ] && cp -pdv $LIB $out/lib

     

       60
       +
                 done

     

       61
       +
               done

     

       62
       +
               return 0

     

       63
       +
             }

     

       64
        
       

     

       65
        
             # Copy BusyBox.

     

       66
       +
             for BIN in ${pkgs.busybox}/{s,}bin/*; do

     

       67
       +
               copy_bin_and_libs $BIN

     

       68
       +
             done

     

       69
        
       

     

       70
        
             # Copy some utillinux stuff.

     

       71
       +
             copy_bin_and_libs ${pkgs.utillinux}/sbin/blkid

     

       0
        
       
     

       0
        
       
     

       72
        
       

     

       73
        
             # Copy dmsetup and lvm.

     

       74
       +
             copy_bin_and_libs ${pkgs.lvm2}/sbin/dmsetup

     

       75
       +
             copy_bin_and_libs ${pkgs.lvm2}/sbin/lvm

     

       0
        
       
     

       0
        
       
     

       76
        
       

     

       77
        
             # Add RAID mdadm tool.

     

       78
       +
             copy_bin_and_libs ${pkgs.mdadm}/sbin/mdadm

     

       79
        
       

     

       80
        
             # Copy udev.

     

       81
       +
             copy_bin_and_libs ${udev}/lib/systemd/systemd-udevd

     

       82
       +
             copy_bin_and_libs ${udev}/bin/udevadm

     

       83
       +
             for BIN in ${udev}/lib/udev/*_id; do

     

       84
       +
               copy_bin_and_libs $BIN

     

       85
       +
             done

     

       0
        
       
     

       86
        
       

     

       87
        
             # Copy modprobe.

     

       88
       +
             copy_bin_and_libs ${pkgs.kmod}/bin/kmod

     

       89
        
             ln -sf kmod $out/bin/modprobe

     

       90
        
       

     

       91
        
             ${config.boot.initrd.extraUtilsCommands}

     
···

       112
        
             $out/bin/ash -c 'echo hello world' | grep "hello world"

     

       113
        
             export LD_LIBRARY_PATH=$out/lib

     

       114
        
             $out/bin/mount --help 2>&1 | grep "BusyBox"

     

       115
       +
             $out/bin/blkid >/dev/null

     

       116
        
             $out/bin/udevadm --version

     

       117
        
             $out/bin/dmsetup --version 2>&1 | tee -a log | grep "version:"

     

       118
        
             LVM_SYSTEM_DIR=$out $out/bin/lvm version 2>&1 | tee -a log | grep "LVM"

+1 -5

nixos/modules/tasks/filesystems/btrfs.nix

···

       17
        
       

     

       18
        
           boot.initrd.extraUtilsCommands = mkIf inInitrd

     

       19
        
             ''

     

       20
       -
               mkdir -p $out/bin

     

       21
       -
               cp -v ${pkgs.btrfsProgs}/bin/btrfs $out/bin

     

       22
        
               ln -sv btrfs $out/bin/btrfsck

     

       23
        
               ln -sv btrfsck $out/bin/fsck.btrfs

     

       24
       -
               # !!! Increases uncompressed initrd by 240k

     

       25
       -
               cp -pv ${pkgs.zlib}/lib/libz.so* $out/lib

     

       26
       -
               cp -pv ${pkgs.lzo}/lib/liblzo2.so* $out/lib

     

       27
        
             '';

     

       28
        
       

     

       29
        
           boot.initrd.extraUtilsCommandsTest = mkIf inInitrd

···

       17
        
       

     

       18
        
           boot.initrd.extraUtilsCommands = mkIf inInitrd

     

       19
        
             ''

     

       20
       +
               copy_bin_and_libs ${pkgs.btrfsProgs}/bin/btrfs

     

       0
        
       
     

       21
        
               ln -sv btrfs $out/bin/btrfsck

     

       22
        
               ln -sv btrfsck $out/bin/fsck.btrfs

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       23
        
             '';

     

       24
        
       

     

       25
        
           boot.initrd.extraUtilsCommandsTest = mkIf inInitrd

+1 -1

nixos/modules/tasks/filesystems/cifs.nix

···

       18
        
       

     

       19
        
           boot.initrd.extraUtilsCommands = mkIf inInitrd

     

       20
        
             ''

     

       21
       -
               cp -v ${pkgs.cifs_utils}/sbin/mount.cifs $out/bin

     

       22
        
             '';

     

       23
        
       

     

       24
        
         };

···

       18
        
       

     

       19
        
           boot.initrd.extraUtilsCommands = mkIf inInitrd

     

       20
        
             ''

     

       21
       +
               copy_bin_and_libs ${pkgs.cifs_utils}/sbin/mount.cifs

     

       22
        
             '';

     

       23
        
       

     

       24
        
         };

+2 -3

nixos/modules/tasks/filesystems/ext.nix

···

       10
        
           boot.initrd.extraUtilsCommands =

     

       11
        
             ''

     

       12
        
               # Copy e2fsck and friends.

     

       13
       -
               cp -v ${pkgs.e2fsprogs}/sbin/e2fsck $out/bin

     

       14
       -
               cp -v ${pkgs.e2fsprogs}/sbin/tune2fs $out/bin

     

       15
        
               ln -sv e2fsck $out/bin/fsck.ext2

     

       16
        
               ln -sv e2fsck $out/bin/fsck.ext3

     

       17
        
               ln -sv e2fsck $out/bin/fsck.ext4

     

       18
       -
               cp -pdv ${pkgs.e2fsprogs}/lib/lib*.so.* $out/lib

     

       19
        
             '';

     

       20
        
       

     

       21
        
         };

···

       10
        
           boot.initrd.extraUtilsCommands =

     

       11
        
             ''

     

       12
        
               # Copy e2fsck and friends.

     

       13
       +
               copy_bin_and_libs ${pkgs.e2fsprogs}/sbin/e2fsck

     

       14
       +
               copy_bin_and_libs ${pkgs.e2fsprogs}/sbin/tune2fs

     

       15
        
               ln -sv e2fsck $out/bin/fsck.ext2

     

       16
        
               ln -sv e2fsck $out/bin/fsck.ext3

     

       17
        
               ln -sv e2fsck $out/bin/fsck.ext4

     

       0
        
       
     

       18
        
             '';

     

       19
        
       

     

       20
        
         };

+1 -3

nixos/modules/tasks/filesystems/f2fs.nix

···

       13
        
           boot.initrd.availableKernelModules = mkIf inInitrd [ "f2fs" ];

     

       14
        
       

     

       15
        
           boot.initrd.extraUtilsCommands = mkIf inInitrd ''

     

       16
       -
             mkdir -p $out/bin $out/lib

     

       17
       -
             cp -v   ${pkgs.f2fs-tools}/sbin/fsck.f2fs $out/bin

     

       18
       -
             cp -pdv ${pkgs.f2fs-tools}/lib/lib*.so.* $out/lib

     

       19
        
           '';

     

       20
        
         };

     

       21
        
       }

···

       13
        
           boot.initrd.availableKernelModules = mkIf inInitrd [ "f2fs" ];

     

       14
        
       

     

       15
        
           boot.initrd.extraUtilsCommands = mkIf inInitrd ''

     

       16
       +
             copy_bin_and_libs ${pkgs.f2fs-tools}/sbin/fsck.f2fs

     

       0
        
       
     

       0
        
       
     

       17
        
           '';

     

       18
        
         };

     

       19
        
       }

+1 -1

nixos/modules/tasks/filesystems/jfs.nix

···

       13
        
           boot.initrd.kernelModules = mkIf inInitrd [ "jfs" ];

     

       14
        
       

     

       15
        
           boot.initrd.extraUtilsCommands = mkIf inInitrd ''

     

       16
       -
             cp -v ${pkgs.jfsutils}/sbin/fsck.jfs "$out/bin/"

     

       17
        
           '';

     

       18
        
         };

     

       19
        
       }

···

       13
        
           boot.initrd.kernelModules = mkIf inInitrd [ "jfs" ];

     

       14
        
       

     

       15
        
           boot.initrd.extraUtilsCommands = mkIf inInitrd ''

     

       16
       +
             copy_bin_and_libs ${pkgs.jfsutils}/sbin/fsck.jfs

     

       17
        
           '';

     

       18
        
         };

     

       19
        
       }

+1 -2

nixos/modules/tasks/filesystems/reiserfs.nix

···

       17
        
       

     

       18
        
           boot.initrd.extraUtilsCommands = mkIf inInitrd

     

       19
        
             ''

     

       20
       -
               cp -v ${pkgs.reiserfsprogs}/sbin/reiserfsck $out/bin

     

       21
       -
               ln -sv reiserfsck $out/bin/fsck.reiserfs

     

       22
        
             '';

     

       23
        
       

     

       24
        
         };

···

       17
        
       

     

       18
        
           boot.initrd.extraUtilsCommands = mkIf inInitrd

     

       19
        
             ''

     

       20
       +
               copy_bin_and_libs ${pkgs.reiserfsprogs}/sbin/reiserfsck

     

       0
        
       
     

       21
        
             '';

     

       22
        
       

     

       23
        
         };

+2 -3

nixos/modules/tasks/filesystems/unionfs-fuse.nix

···

       7
        
             boot.initrd.kernelModules = [ "fuse" ];

     

       8
        
       

     

       9
        
             boot.initrd.extraUtilsCommands = ''

     

       10
       -
               cp -v ${pkgs.fuse}/lib/libfuse* $out/lib

     

       11
       -
               cp -v ${pkgs.fuse}/sbin/mount.fuse $out/bin

     

       12
       -
               cp -v ${pkgs.unionfs-fuse}/bin/unionfs $out/bin

     

       13
        
               substitute ${pkgs.unionfs-fuse}/sbin/mount.unionfs-fuse $out/bin/mount.unionfs-fuse \

     

       14
        
                 --replace '${pkgs.bash}/bin/bash' /bin/sh \

     

       15
        
                 --replace '${pkgs.fuse}/sbin' /bin \

···

       7
        
             boot.initrd.kernelModules = [ "fuse" ];

     

       8
        
       

     

       9
        
             boot.initrd.extraUtilsCommands = ''

     

       10
       +
               copy_bin_and_libs ${pkgs.fuse}/sbin/mount.fuse

     

       11
       +
               copy_bin_and_libs ${pkgs.unionfs-fuse}/bin/unionfs

     

       0
        
       
     

       12
        
               substitute ${pkgs.unionfs-fuse}/sbin/mount.unionfs-fuse $out/bin/mount.unionfs-fuse \

     

       13
        
                 --replace '${pkgs.bash}/bin/bash' /bin/sh \

     

       14
        
                 --replace '${pkgs.fuse}/sbin' /bin \

+1 -2

nixos/modules/tasks/filesystems/vfat.nix

···

       17
        
       

     

       18
        
           boot.initrd.extraUtilsCommands = mkIf inInitrd

     

       19
        
             ''

     

       20
       -
               cp -v ${pkgs.dosfstools}/sbin/dosfsck $out/bin

     

       21
       -
               ln -sv dosfsck $out/bin/fsck.vfat

     

       22
        
             '';

     

       23
        
       

     

       24
        
         };

···

       17
        
       

     

       18
        
           boot.initrd.extraUtilsCommands = mkIf inInitrd

     

       19
        
             ''

     

       20
       +
               copy_bin_and_libs ${pkgs.dosfstools}/sbin/dosfsck

     

       0
        
       
     

       21
        
             '';

     

       22
        
       

     

       23
        
         };

+1 -1

nixos/modules/tasks/filesystems/xfs.nix

···

       17
        
       

     

       18
        
           boot.initrd.extraUtilsCommands = mkIf inInitrd

     

       19
        
             ''

     

       20
       -
               cp -v ${pkgs.xfsprogs}/sbin/fsck.xfs $out/bin

     

       21
        
             '';

     

       22
        
       

     

       23
        
           # Trick just to set 'sh' after the extraUtils nuke-refs.

···

       17
        
       

     

       18
        
           boot.initrd.extraUtilsCommands = mkIf inInitrd

     

       19
        
             ''

     

       20
       +
               copy_bin_and_libs ${pkgs.xfsprogs}/sbin/fsck.xfs

     

       21
        
             '';

     

       22
        
       

     

       23
        
           # Trick just to set 'sh' after the extraUtils nuke-refs.

+8 -5

nixos/modules/tasks/filesystems/zfs.nix

···

       203
        
               kernelModules = [ "spl" "zfs" ];

     

       204
        
               extraUtilsCommands =

     

       205
        
                 ''

     

       206
       -
                   cp -v ${zfsUserPkg}/sbin/zfs $out/bin

     

       207
       -
                   cp -v ${zfsUserPkg}/sbin/zdb $out/bin

     

       208
       -
                   cp -v ${zfsUserPkg}/sbin/zpool $out/bin

     

       209
       -
                   cp -pdv ${zfsUserPkg}/lib/lib*.so* $out/lib

     

       210
       -
                   cp -pdv ${pkgs.zlib}/lib/lib*.so* $out/lib

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       211
        
                 '';

     

       212
        
               postDeviceCommands = concatStringsSep "\n" ([''

     

       213
        
                   ZFS_FORCE="${optionalString cfgZfs.forceImportRoot "-f"}"

···

       203
        
               kernelModules = [ "spl" "zfs" ];

     

       204
        
               extraUtilsCommands =

     

       205
        
                 ''

     

       206
       +
                   copy_bin_and_libs ${zfsUserPkg}/sbin/zfs

     

       207
       +
                   copy_bin_and_libs ${zfsUserPkg}/sbin/zdb

     

       208
       +
                   copy_bin_and_libs ${zfsUserPkg}/sbin/zpool

     

       209
       +
                 '';

     

       210
       +
               extraUtilsCommandsTest = mkIf inInitrd

     

       211
       +
                 ''

     

       212
       +
                   $out/bin/zfs --help >/dev/null 2>&1

     

       213
       +
                   $out/bin/zpool --help >/dev/null 2>&1

     

       214
        
                 '';

     

       215
        
               postDeviceCommands = concatStringsSep "\n" ([''

     

       216
        
                   ZFS_FORCE="${optionalString cfgZfs.forceImportRoot "-f"}"

+1 -1

nixos/modules/virtualisation/amazon-image.nix

···

       165
        
           boot.initrd.extraUtilsCommands =

     

       166
        
             ''

     

       167
        
               # We need swapon in the initrd.

     

       168
       -
               cp --remove-destination ${pkgs.utillinux}/sbin/swapon $out/bin

     

       169
        
             '';

     

       170
        
       

     

       171
        
           # Don't put old configurations in the GRUB menu.  The user has no

···

       165
        
           boot.initrd.extraUtilsCommands =

     

       166
        
             ''

     

       167
        
               # We need swapon in the initrd.

     

       168
       +
               copy_bin_and_libs ${pkgs.utillinux}/sbin/swapon

     

       169
        
             '';

     

       170
        
       

     

       171
        
           # Don't put old configurations in the GRUB menu.  The user has no

+1 -1

nixos/modules/virtualisation/qemu-vm.nix

···

       346
        
           boot.initrd.extraUtilsCommands =

     

       347
        
             ''

     

       348
        
               # We need mke2fs in the initrd.

     

       349
       -
               cp -vf --remove-destination ${pkgs.e2fsprogs}/sbin/mke2fs $out/bin

     

       350
        
             '';

     

       351
        
       

     

       352
        
           boot.initrd.postDeviceCommands =

···

       346
        
           boot.initrd.extraUtilsCommands =

     

       347
        
             ''

     

       348
        
               # We need mke2fs in the initrd.

     

       349
       +
               copy_bin_and_libs ${pkgs.e2fsprogs}/sbin/mke2fs

     

       350
        
             '';

     

       351
        
       

     

       352
        
           boot.initrd.postDeviceCommands =

+2 -3

nixos/tests/virtualbox.nix

···

       39
        
           ];

     

       40
        
       

     

       41
        
           boot.initrd.extraUtilsCommands = ''

     

       42
       -
             cp -av -t "$out/bin/" \

     

       43
       -
               "${pkgs.linuxPackages.virtualboxGuestAdditions}/sbin/mount.vboxsf" \

     

       44
       -
               "${pkgs.utillinux}/bin/unshare"

     

       45
        
             ${(attrs.extraUtilsCommands or (const "")) pkgs}

     

       46
        
           '';

     

       47

···

       39
        
           ];

     

       40
        
       

     

       41
        
           boot.initrd.extraUtilsCommands = ''

     

       42
       +
             copy_bin_and_libs "${pkgs.linuxPackages.virtualboxGuestAdditions}/sbin/mount.vboxsf"

     

       43
       +
             copy_bin_and_libs "${pkgs.utillinux}/bin/unshare"

     

       0
        
       
     

       44
        
             ${(attrs.extraUtilsCommands or (const "")) pkgs}

     

       45
        
           '';

     

       46