From 949bd6f298590a6b4fe71783c15bac313cbc2923 Mon Sep 17 00:00:00 2001 From: Natanael Copa Date: Mon, 18 Jan 2016 10:12:04 +0100 Subject: init: dont launch emergency shell if http repo is specified we we specify a repo with boot option then we should not launch an emergency shell even if no repo was found. This is needed for pxe boot. --- initramfs-init.in | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/initramfs-init.in b/initramfs-init.in index 63d96e1..c5a6e84 100755 --- a/initramfs-init.in +++ b/initramfs-init.in @@ -379,11 +379,17 @@ if [ -n "$KOPT_root" ]; then exec /bin/busybox sh fi +if [ -n "$ALPINE_REPO" ]; then + repoopts="-n" +else + repoopts="-b $repofile" +fi + # locate boot media and mount it ebegin "Mounting boot media" nlplug-findfs $cryptopts -p /sbin/mdev ${KOPT_debug_init:+-d} \ ${KOPT_usbdelay:+-t $(( $KOPT_usbdelay * 1000 ))} \ - -b $repofile -a /tmp/apkovls + $repoopts -a /tmp/apkovls eend $? # early console? -- cgit v1.2.3