public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

luksroot uses preLVMCommands instead of postDeviceCommands

Browse Source 
svn path=/nixos/trunk/; revision=31131
This commit is contained in:
Florian Friesdorf 2011-12-28 21:46:48 +00:00
parent 90756a787c
commit c15aa7aea3
1 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
modules/system/boot/luksroot.nix
View File

@ -40,11 +40,9 @@ in
boot.initrd.extraUtilsCommandsTest = '' boot.initrd.extraUtilsCommandsTest = ''
$out/bin/cryptsetup --version $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. # Wait for luksRoot to appear, e.g. if on a usb drive.
# XXX: copied and adapted from stage-1-init.sh - should be # XXX: copied and adapted from stage-1-init.sh - should be
# available as a function. # available as a function.
@ -59,8 +57,6 @@ in
fi fi
# open luksRoot and scan for logical volumes # open luksRoot and scan for logical volumes
cryptsetup luksOpen ${luksRoot} luksroot cryptsetup luksOpen ${luksRoot} luksroot
lvm vgscan
lvm vgchange -ay
''; '';
}; };