diff options
| author | Nikolay Amiantov <ab@fmap.me> | 2019-07-25 16:32:08 +0300 |
|---|---|---|
| committer | Nikolay Amiantov <ab@fmap.me> | 2019-08-01 00:55:35 +0300 |
| commit | b4581211058eb27bbfbc8738ac44b718fc743400 (patch) | |
| tree | 5691bc637a09b808655196c27302bfa59eb02662 /nixos/modules/system/boot/stage-1.nix | |
| parent | 88d5b40d40cec83934dcbdf29a98e18ea4ff1b8c (diff) | |
| download | nixpkgs-b4581211058eb27bbfbc8738ac44b718fc743400.tar nixpkgs-b4581211058eb27bbfbc8738ac44b718fc743400.tar.gz nixpkgs-b4581211058eb27bbfbc8738ac44b718fc743400.tar.bz2 nixpkgs-b4581211058eb27bbfbc8738ac44b718fc743400.tar.lz nixpkgs-b4581211058eb27bbfbc8738ac44b718fc743400.tar.xz nixpkgs-b4581211058eb27bbfbc8738ac44b718fc743400.tar.zst nixpkgs-b4581211058eb27bbfbc8738ac44b718fc743400.zip | |
stage-1 initrd: replace absolute paths for mdadm
We don't patch basename and readlink now too as they were added for mdadm in 8ecd3a5e1db4.
Diffstat (limited to 'nixos/modules/system/boot/stage-1.nix')
| -rw-r--r-- | nixos/modules/system/boot/stage-1.nix | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/nixos/modules/system/boot/stage-1.nix b/nixos/modules/system/boot/stage-1.nix index 788e3f4a2ab..4c2d130d5a5 100644 --- a/nixos/modules/system/boot/stage-1.nix +++ b/nixos/modules/system/boot/stage-1.nix @@ -217,13 +217,11 @@ let --replace ata_id ${extraUtils}/bin/ata_id \ --replace scsi_id ${extraUtils}/bin/scsi_id \ --replace cdrom_id ${extraUtils}/bin/cdrom_id \ - --replace ${pkgs.utillinux}/sbin/blkid ${extraUtils}/bin/blkid \ - --replace /sbin/blkid ${extraUtils}/bin/blkid \ + --replace ${pkgs.coreutils}/bin/basename ${extraUtils}/bin/basename \ + --replace ${pkgs.utillinux}/bin/blkid ${extraUtils}/bin/blkid \ --replace ${pkgs.lvm2}/sbin ${extraUtils}/bin \ - --replace /sbin/mdadm ${extraUtils}/bin/mdadm \ + --replace ${pkgs.mdadm}/sbin ${extraUtils}/sbin \ --replace ${pkgs.bash}/bin/sh ${extraUtils}/bin/sh \ - --replace /usr/bin/readlink ${extraUtils}/bin/readlink \ - --replace /usr/bin/basename ${extraUtils}/bin/basename \ --replace ${udev}/bin/udevadm ${extraUtils}/bin/udevadm done |