home: hub: mkinitfs

Info  •  Files  •  Log

init: also pass cryptopts when looking for apkovl/bootrepo

in theory we should be able to have apkovl on LUKS device

--- a/initramfs-init.in

+++ b/initramfs-init.in

@@ -341,6 +341,13 @@

 fi

 eend 0

+if [ -n "$KOPT_cryptroot" ]; then

+	cryptopts="-c ${KOPT_cryptroot}"

+	if [ -n "$KOPT_cryptdm" ]; then

+		cryptopts="$cryptopts -m ${KOPT_cryptdm}"

+	fi

+fi

+

 # check if root=... was set

 if [ -n "$KOPT_root" ]; then

 	if [ "$SINGLEMODE" = "yes" ]; then

@@ -348,12 +355,6 @@

 		sh

 	fi

-	if [ -n "$KOPT_cryptroot" ]; then

-		cryptopts="-c ${KOPT_cryptroot}"

-		if [ -n "$KOPT_cryptdm" ]; then

-			cryptopts="$cryptopts -m ${KOPT_cryptdm}"

-		fi

-	fi

 	ebegin "Mounting root"

 	if [ "$KOPT_overlaytmpfs" = "yes" ]; then

 		mkdir -p /media/root-ro /media/root-rw $sysroot/media/root-ro \

@@ -385,7 +386,7 @@

 # locate boot media and mount it

 ebegin "Mounting boot media"

-nlplug-findfs -p /sbin/mdev ${KOPT_debug_init:+-d} \

+nlplug-findfs $cryptopts -p /sbin/mdev ${KOPT_debug_init:+-d} \

 	${KOPT_usbdelay:+-t $(( $KOPT_usbdelay * 1000 ))} \

 	-b /tmp/repositories -a /tmp/apkovls

 eend $?