Author: chaoflow
Date: Wed Dec 28 21:46:48 2011
New Revision: 31131
URL: https://nixos.org/websvn/nix/?rev=31131&sc=1
Log:
luksroot uses preLVMCommands instead of postDeviceCommands
Modified:
nixos/trunk/modules/system/boot/luksroot.nix
Modified: nixos/trunk/modules/system/boot/luksroot.nix
==============================================================================
--- nixos/trunk/modules/system/boot/luksroot.nix Wed Dec 28 21:46:45
2011 (r31130)
+++ nixos/trunk/modules/system/boot/luksroot.nix Wed Dec 28 21:46:48
2011 (r31131)
@@ -40,11 +40,9 @@
boot.initrd.extraUtilsCommandsTest = ''
$out/bin/cryptsetup --version
- $out/bin/lvm vgscan --version
- $out/bin/lvm vgchange --version
'';
- boot.initrd.postDeviceCommands = ''
+ boot.initrd.preLVMCommands = ''
# Wait for luksRoot to appear, e.g. if on a usb drive.
# XXX: copied and adapted from stage-1-init.sh - should be
# available as a function.
@@ -59,8 +57,6 @@
fi
# open luksRoot and scan for logical volumes
cryptsetup luksOpen ${luksRoot} luksroot
- lvm vgscan
- lvm vgchange -ay
'';
};
_______________________________________________
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits
