X-Original-To: alpine-devel@lists.alpinelinux.org Received: from mx1.tetrasec.net (mx1.tetrasec.net [74.117.190.25]) by lists.alpinelinux.org (Postfix) with ESMTP id 66470F858C6 for ; Thu, 3 Jan 2019 13:24:27 +0000 (UTC) Received: from mx1.tetrasec.net (mail.local [127.0.0.1]) by mx1.tetrasec.net (Postfix) with ESMTP id 389A99E1ECF; Thu, 3 Jan 2019 13:24:27 +0000 (GMT) Received: from ncopa-desktop.copa.dup.pw (67.63.200.37.customer.cdi.no [37.200.63.67]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) (Authenticated sender: alpine@tanael.org) by mx1.tetrasec.net (Postfix) with ESMTPSA id 9CD879E1E49; Thu, 3 Jan 2019 13:24:26 +0000 (GMT) Date: Thu, 3 Jan 2019 14:24:21 +0100 From: Natanael Copa To: Jesse Young Cc: alpine-devel@lists.alpinelinux.org Subject: Re: [alpine-devel] [PATCH] mkinitfs: init: enable the init= kernel command line argument Message-ID: <20190103142421.3941d83b@ncopa-desktop.copa.dup.pw> In-Reply-To: <20180813185524.GA2527@varda.jlyo.org> References: <20180813185524.GA2527@varda.jlyo.org> X-Mailer: Claws Mail 3.17.1 (GTK+ 2.24.32; x86_64-alpine-linux-musl) X-Mailinglist: alpine-devel Precedence: list List-Id: Alpine Development List-Unsubscribe: List-Post: List-Help: List-Subscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit On Mon, 13 Aug 2018 13:55:24 -0500 Jesse Young wrote: > --- > initramfs-init.in | 13 ++++++++----- > 1 file changed, 8 insertions(+), 5 deletions(-) This was finally merged, for inclusion in alpine v3.9. Thank you! -nc > diff --git a/initramfs-init.in b/initramfs-init.in > index 8233af4..f7c2493 100755 > --- a/initramfs-init.in > +++ b/initramfs-init.in > @@ -282,7 +282,7 @@ rtc_exists() { > set -- $(cat /proc/cmdline) > > myopts="alpine_dev autodetect autoraid chart cryptroot cryptdm cryptheader cryptoffset > - cryptdiscards cryptkey debug_init dma init_args keep_apk_new modules ovl_dev > + cryptdiscards cryptkey debug_init dma init init_args keep_apk_new modules ovl_dev > pkgs quiet root_size root usbdelay ip alpine_repo apkovl alpine_start splash > blacklist overlaytmpfs rootfstype rootflags nbd resume s390x_net dasd ssh_key" > > @@ -312,6 +312,9 @@ done > # enable debugging if requested > [ -n "$KOPT_debug_init" ] && set -x > > +# set default values > +: ${KOPT_init:=/sbin/init} > + > # pick first keymap if found > for map in /etc/keymap/*; do > if [ -f "$map" ]; then > @@ -466,7 +469,7 @@ if [ -n "$KOPT_root" ]; then > fi > done > sync > - exec /bin/busybox switch_root $sysroot $chart_init /sbin/init $KOPT_init_args > + exec /bin/busybox switch_root $sysroot $chart_init "$KOPT_init" $KOPT_init_args > echo "initramfs emergency recovery shell launched" > exec /bin/busybox sh > fi > @@ -725,9 +728,9 @@ if [ "$KOPT_chart" = yes ]; then > chart_init="/sbin/bootchartd start-rootfs" > fi > > -if [ ! -x $sysroot/sbin/init ]; then > +if [ ! -x "${sysroot}${KOPT_init}" ]; then > [ "$KOPT_splash" != "no" ] && echo exit > $sysroot/$splashfile > - echo "/sbin/init not found in new root. Launching emergency recovery shell" > + echo "$KOPT_init not found in new root. Launching emergency recovery shell" > echo "Type exit to continue boot." > /bin/busybox sh > fi > @@ -743,7 +746,7 @@ sync > > [ "$KOPT_splash" = "init" ] && echo exit > $sysroot/$splashfile > echo "" > -exec /bin/busybox switch_root $sysroot $chart_init /sbin/init $KOPT_init_args > +exec /bin/busybox switch_root $sysroot $chart_init "$KOPT_init" $KOPT_init_args > > [ "$KOPT_splash" != "no" ] && echo exit > $sysroot/$splashfile > echo "initramfs emergency recovery shell launched" --- Unsubscribe: alpine-devel+unsubscribe@lists.alpinelinux.org Help: alpine-devel+help@lists.alpinelinux.org ---