From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7180261367669063680 X-Received: by 2002:ac2:43ab:0:b0:4b5:6b5a:c4a7 with SMTP id t11-20020ac243ab000000b004b56b5ac4a7mr977483lfl.473.1671784925177; Fri, 23 Dec 2022 00:42:05 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:ac2:4e8a:0:b0:4c8:8384:83f3 with SMTP id o10-20020ac24e8a000000b004c8838483f3ls127516lfr.3.-pod-prod-gmail; Fri, 23 Dec 2022 00:42:03 -0800 (PST) X-Google-Smtp-Source: AMrXdXsy2R3ShBxssD6VUs0u8EphDkyyZaQyfE+TzGSKud+1inKbbIMsuOly+/Sqr9XYewseAP6x X-Received: by 2002:ac2:4430:0:b0:4b6:ed8b:4f19 with SMTP id w16-20020ac24430000000b004b6ed8b4f19mr3000753lfl.52.1671784923857; Fri, 23 Dec 2022 00:42:03 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1671784923; cv=none; d=google.com; s=arc-20160816; b=v4B3Y81370rcwP92LMRlgo68NVI6yKaAC95ZyXWmF1uwSMlPBk7GHuTJkbEf429tCV tfr5L6nhtLavUlfMhCSSC9YyIgEi8WTs9Vrjaf2yZJKESLSmv8Wa9K93mhTuxEQn4MgZ k71tGbpSUs2lFPrKMv3DasjyByAvTNwXXXpd5Qc0p5+CnZY3rofKiBtWq0LMGwQ69d/7 KkUgZGr7SDG7sbAuDs3dNBbcKOLeiY+hra+8nGi3AUoIsK00iO7okqSVeKS+t1zmqsm/ qlbWiUkLC8bSv99Kx1SyxSPDEQ49cMmyo92vVYQ1eoiQBa4/7QV+/xdwGic77jEpeuAo puVg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=feedback-id:content-transfer-encoding:mime-version:references :in-reply-to:message-id:date:subject:cc:to:from:dkim-signature; bh=Wi1pD11lsVv4qRZH1bFj5a1ZTT0YDPRiUrO6QDOshKQ=; b=ZPxXZHT/mQW9ZSSlG6b07E8nwP93y05/vj91I9B9/SncpVrUk/pReDU5e6cD9oKEf9 RNvU78wHq9Cu90NszAqnE9lq6ghIAG0iMO/OSZP7xWXPVUATcjHtfyEFUiq5SubdixWl 1cUrvqHOcxmIrxbcUYsXRdt91zEPDCdzL6TNaM1FyGpCvmSYR7yBhXOApyvQUyZhCJqu p4auILJvhlxR0//1Lb3U+mMA7ChkvyoivZmifKLTg8LT6rysFFrd2drIlaG4RhEUusQe 3i924DDX49Watr544j6rDeSABTiUXG/8YaO9znhP9j18HW089oeyzd1fj7gvtey+h8e0 hqjw== ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=QTwM0400; spf=pass (google.com: domain of fm-72506-20221223084203c717b3c383d68bc20b-dpqrll@rts-flowmailer.siemens.com designates 185.136.64.225 as permitted sender) smtp.mailfrom=fm-72506-20221223084203c717b3c383d68bc20b-DPQRlL@rts-flowmailer.siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Return-Path: Received: from mta-64-225.siemens.flowmailer.net (mta-64-225.siemens.flowmailer.net. [185.136.64.225]) by gmr-mx.google.com with ESMTPS id f1-20020a056512360100b004b069b33a43si140427lfs.3.2022.12.23.00.42.03 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 23 Dec 2022 00:42:03 -0800 (PST) Received-SPF: pass (google.com: domain of fm-72506-20221223084203c717b3c383d68bc20b-dpqrll@rts-flowmailer.siemens.com designates 185.136.64.225 as permitted sender) client-ip=185.136.64.225; Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=QTwM0400; spf=pass (google.com: domain of fm-72506-20221223084203c717b3c383d68bc20b-dpqrll@rts-flowmailer.siemens.com designates 185.136.64.225 as permitted sender) smtp.mailfrom=fm-72506-20221223084203c717b3c383d68bc20b-DPQRlL@rts-flowmailer.siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Received: by mta-64-225.siemens.flowmailer.net with ESMTPSA id 20221223084203c717b3c383d68bc20b for ; Fri, 23 Dec 2022 09:42:03 +0100 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; s=fm1; d=siemens.com; i=felix.moessbauer@siemens.com; h=Date:From:Subject:To:Message-ID:MIME-Version:Content-Type:Content-Transfer-Encoding:Cc:References:In-Reply-To; bh=Wi1pD11lsVv4qRZH1bFj5a1ZTT0YDPRiUrO6QDOshKQ=; b=QTwM0400yUBHP8D1BL941e8owg7eFjk6p82sPF/yohpLCvKFir3WMoK+UxiGBA4HYsxecl ZjF84/TrgKG9mv90yptxoLeDEuX/mdIq2xu/SioeThc0lCR0p6SfpOiGptjuCD9OI4omjk3Z 0As2ufSzGu/XiSUaZhoUo2IaVlgmY=; From: Felix Moessbauer To: isar-users@googlegroups.com Cc: tobias.preclik@siemens.com, christian.storm@siemens.com, Felix Moessbauer Subject: [PATCH 09/10] fix: only append kargs and extra_kargs if set Date: Fri, 23 Dec 2022 08:40:57 +0000 Message-Id: <20221223084058.1899957-10-felix.moessbauer@siemens.com> In-Reply-To: <20221223084058.1899957-1-felix.moessbauer@siemens.com> References: <20221223084058.1899957-1-felix.moessbauer@siemens.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Flowmailer-Platform: Siemens Feedback-ID: 519:519-72506:519-21489:flowmailer X-TUID: JiFV61cUj1dS This fixes an issue when no KARGS and no EXTRA_KARGS where set, leading to an empty string after -append. This happens for instance when booting a WIC image instead of performing a direct kernel boot. Instead of always adding -append, we only add it if at least on of the variables is set. Signed-off-by: Felix Moessbauer --- scripts/start_vm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/scripts/start_vm b/scripts/start_vm index 8876e53..3c0ba16 100755 --- a/scripts/start_vm +++ b/scripts/start_vm @@ -19,6 +19,7 @@ bb2sh() { start_qemu() { root=`echo $QEMU_DISK_ARGS \ | sed 's,##ROOTFS_IMAGE##,'$IMAGE_DIR/$ROOTFS_IMAGE','` + [ -n "$KARGS$EXTRA_KARGS" ] && OPT_KERNEL_ARGS="-append $KARGS$EXTRA_KARGS" local had_x echo $- | grep -q x && had_x=1 || had_x=0 [ $had_x -eq 0 ] && set -x @@ -28,7 +29,7 @@ start_qemu() { $QCPU \ -nographic \ $EXTRA_ARGS \ - -append "$KARGS$EXTRA_KARGS" \ + $OPT_KERNEL_ARGS \ $root [ $had_x -eq 0 ] && set +x } -- 2.34.1