summary refs log tree commit diff
path: root/modules/system/boot/stage-1.nix
diff options
context:
space:
mode:
authorEelco Dolstra <eelco.dolstra@logicblox.com>2012-08-16 15:37:13 -0400
committerEelco Dolstra <eelco.dolstra@logicblox.com>2012-08-16 15:37:13 -0400
commit7e99541afed8951cd27a61c30c419c3b36a60ccf (patch)
treeec47c2f5fb269e59d064df37a3b640610cac43d7 /modules/system/boot/stage-1.nix
parenta025e7e7e287c2539d883bd40a769ae29f9087ff (diff)
downloadnixpkgs-7e99541afed8951cd27a61c30c419c3b36a60ccf.tar
nixpkgs-7e99541afed8951cd27a61c30c419c3b36a60ccf.tar.gz
nixpkgs-7e99541afed8951cd27a61c30c419c3b36a60ccf.tar.bz2
nixpkgs-7e99541afed8951cd27a61c30c419c3b36a60ccf.tar.lz
nixpkgs-7e99541afed8951cd27a61c30c419c3b36a60ccf.tar.xz
nixpkgs-7e99541afed8951cd27a61c30c419c3b36a60ccf.tar.zst
nixpkgs-7e99541afed8951cd27a61c30c419c3b36a60ccf.zip
Fix initrd for the latest lvm2
Diffstat (limited to 'modules/system/boot/stage-1.nix')
-rw-r--r--modules/system/boot/stage-1.nix4
1 files changed, 3 insertions, 1 deletions
diff --git a/modules/system/boot/stage-1.nix b/modules/system/boot/stage-1.nix
index 01ecd839f55..265adf163fc 100644
--- a/modules/system/boot/stage-1.nix
+++ b/modules/system/boot/stage-1.nix
@@ -230,6 +230,7 @@ let
       cp -v ${pkgs.mdadm}/lib/udev/rules.d/*.rules $out/
 
       for i in $out/*.rules; do
+      
           substituteInPlace $i \
             --replace ata_id ${extraUtils}/bin/ata_id \
             --replace usb_id ${extraUtils}/bin/usb_id \
@@ -237,9 +238,10 @@ let
             --replace path_id ${extraUtils}/bin/path_id \
             --replace vol_id ${extraUtils}/bin/vol_id \
             --replace cdrom_id ${extraUtils}/bin/cdrom_id \
+            --replace ${pkgs.utillinux}/sbin/blkid ${extraUtils}/bin/blkid \
             --replace /sbin/blkid ${extraUtils}/bin/blkid \
             --replace /sbin/modprobe ${extraUtils}/bin/modprobe \
-            --replace 'ENV{DM_SBIN_PATH}="${pkgs.lvm2}/sbin"' 'ENV{DM_SBIN_PATH}="${extraUtils}/bin"' \
+            --replace ${pkgs.lvm2}/sbin ${extraUtils}/bin \
             --replace /sbin/mdadm ${extraUtils}/bin/mdadm
       done
       # !!! Remove this after merging the x-updates branch: