From 88d86842aa4e54c763ffc3842dd7b7652ee131ce Mon Sep 17 00:00:00 2001 From: Natanael Copa Date: Wed, 5 Nov 2014 10:25:09 +0100 Subject: init: set start order of raid, cryptsetup and lvm via alpine_start boot opt User might want change the order raid cryptsetup and lvm is started. This allows for example cryptsetup on top of lvm. ref #3420 --- initramfs-init.in | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/initramfs-init.in b/initramfs-init.in index 78e9b80..ff2f02d 100755 --- a/initramfs-init.in +++ b/initramfs-init.in @@ -369,7 +369,7 @@ eval set -- `cat /proc/cmdline` myopts="alpine_dev autodetect autoraid chart cryptroot cryptdm debug_init dma init_args keep_apk_new modules ovl_dev pkgs quiet root_size root - usbdelay ip alpine_repo apkovl" + usbdelay ip alpine_repo apkovl alpine_start" for opt; do case "$opt" in @@ -522,9 +522,10 @@ if [ -n "$KOPT_root" ]; then # let usb settle in case we boot from usb disks [ -n "$KOPT_usbdelay" ] && sleep "$KOPT_usbdelay" wait_usb - start_raid - start_cryptsetup - start_lvm + start=${KOPT_alpine_start:-raid,cryptsetup,lvm} + for i in ${start//,/ }; do + start_$i + done ebegin "Mounting root" retry_mount -o ro $KOPT_root $sysroot 2>/dev/null eend $? @@ -549,9 +550,10 @@ fi configure_ip # incase we have alpine_dev on raid device... -start_raid -start_cryptsetup -start_lvm +start=${KOPT_alpine_start:-raid,cryptsetup,lvm} +for i in ${start//,/ }; do + start_$i +done # locate boot media and mount it ebegin "Mounting boot media" -- cgit v1.2.3