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

add preLVMCommands hook

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

5
modules/system/boot/stage-1-init.sh
View File

@ -123,6 +123,11 @@ udevadm trigger --action=add
udevadm settle udevadm settle
udevadm control --env=STARTUP= udevadm control --env=STARTUP=
# XXX: Use case usb->lvm will still fail, usb->luks->lvm is covered
@preLVMCommands@
echo "starting device mapper and LVM..." echo "starting device mapper and LVM..."
lvm vgscan lvm vgscan
lvm vgchange -ay lvm vgchange -ay

10
modules/system/boot/stage-1.nix
View File

@ -35,6 +35,14 @@ let
''; '';
}; };
boot.initrd.preLVMCommands = mkOption {
default = "";
merge = mergeStringOption;
description = ''
Shell commands to be executed immediately before lvm discovery.
'';
};
boot.initrd.postDeviceCommands = mkOption { boot.initrd.postDeviceCommands = mkOption {
default = ""; default = "";
merge = mergeStringOption; merge = mergeStringOption;
@ -304,7 +312,7 @@ let
inherit (config.boot) resumeDevice devSize runSize; inherit (config.boot) resumeDevice devSize runSize;
inherit (config.boot.initrd) checkJournalingFS inherit (config.boot.initrd) checkJournalingFS
postDeviceCommands postMountCommands kernelModules; preLVMCommands postDeviceCommands postMountCommands kernelModules;
# !!! copy&pasted from upstart-jobs/filesystems.nix. # !!! copy&pasted from upstart-jobs/filesystems.nix.
mountPoints = mountPoints =