add preLVMCommands hook
svn path=/nixos/trunk/; revision=31130
This commit is contained in:
parent
0a9f3a36ec
commit
90756a787c
|
@ -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
|
||||||
|
|
|
@ -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 =
|
||||||
|
|
Loading…
Reference in a new issue