X-Original-To: alpine-devel@lists.alpinelinux.org Received: from varda.jlyo.net (varda.jlyo.net [69.28.91.113]) by lists.alpinelinux.org (Postfix) with ESMTP id AAF655C5589 for ; Mon, 13 Aug 2018 18:55:24 +0000 (GMT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=jlyo.org; s=varda; t=1534186524; bh=gw+DTb6nC2XuNrAsbk5IOPnud6PWF63uD87AQ5+Kn1Q=; h=Received:Date:From:To:Subject:Message-ID:MIME-Version: Content-Type:Content-Disposition:User-Agent; b=3e9xVXd+Nm/g0xvzPOSk7OXb9+oz56iHN/mEZ1a9Yz49sXXki+VL8Ti1GjMujTWyb sHUh3DTea7FpQht8Z829elj+Lh3iPj52dGJSVbPvECVHexIuPUWGi72T6SHnqa6Etk nViIAX7LFSqP/rpws8A3tirbBZzl7vVJ2Ssz0abuIP2AHWuxDwfIPaNbns3gsrpkUy IAgOVDrScAUjq1onuTKCFz+CU9IrduapVkQ5MnRPTqR8ih5wmSRQuAMN9apuDqttxx iSCy/e0mCxhhOe9HtWo9XzYwIfSh2wz5TrI0wYDSSxU6S+aDyN+mK3rImfhdyL6LE9 ssVj8cIuBo/jw== Received: (qmail 2534 invoked by uid 1000); 13 Aug 2018 18:55:24 -0000 Date: Mon, 13 Aug 2018 13:55:24 -0500 From: Jesse Young To: alpine-devel@lists.alpinelinux.org Subject: [alpine-devel] [PATCH] mkinitfs: init: enable the init= kernel command line argument Message-ID: <20180813185524.GA2527@varda.jlyo.org> 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-Disposition: inline User-Agent: Mutt/1.10.1 (2018-07-13) --- initramfs-init.in | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) 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" -- 2.18.0 --- Unsubscribe: alpine-devel+unsubscribe@lists.alpinelinux.org Help: alpine-devel+help@lists.alpinelinux.org ---