From: Felix Moessbauer <felix.moessbauer@siemens.com>
To: isar-users@googlegroups.com
Cc: tobias.preclik@siemens.com, christian.storm@siemens.com,
Felix Moessbauer <felix.moessbauer@siemens.com>
Subject: [PATCH 09/10] fix: only append kargs and extra_kargs if set
Date: Fri, 23 Dec 2022 08:40:57 +0000 [thread overview]
Message-ID: <20221223084058.1899957-10-felix.moessbauer@siemens.com> (raw)
In-Reply-To: <20221223084058.1899957-1-felix.moessbauer@siemens.com>
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 <felix.moessbauer@siemens.com>
---
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
next prev parent reply other threads:[~2022-12-23 8:42 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-12-23 8:40 [PATCH 00/10] Add support for secureboot using Debian boot chain Felix Moessbauer
2022-12-23 8:40 ` [PATCH 01/10] wic: add option to use debian EFI shim Felix Moessbauer
2022-12-23 8:40 ` [PATCH 02/10] add debian sb chain bootloader dependencies Felix Moessbauer
2022-12-23 8:40 ` [PATCH 03/10] add example wic file for sb debian boot chain Felix Moessbauer
2022-12-23 8:40 ` [PATCH 04/10] style: split overlong line in module.inc Felix Moessbauer
2022-12-23 8:40 ` [PATCH 05/10] add support to sign kernel modules Felix Moessbauer
2022-12-23 8:40 ` [PATCH 06/10] add example to generated and distribute MOK data Felix Moessbauer
2023-02-03 6:05 ` Jan Kiszka
2022-12-23 8:40 ` [PATCH 07/10] add signed variant of example-module Felix Moessbauer
2022-12-23 8:40 ` [PATCH 08/10] add new machine qemuamd64-sb and corresponding mc Felix Moessbauer
2022-12-23 8:40 ` Felix Moessbauer [this message]
2022-12-23 8:40 ` [PATCH 10/10] start_vm: add support for secureboot Felix Moessbauer
2023-01-27 5:07 ` Uladzimir Bely
2023-01-27 8:11 ` Moessbauer, Felix
2023-01-27 8:41 ` Florian Bezdeka
2023-01-27 9:10 ` Uladzimir Bely
2023-01-25 7:17 ` [PATCH 00/10] Add support for secureboot using Debian boot chain Uladzimir Bely
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20221223084058.1899957-10-felix.moessbauer@siemens.com \
--to=felix.moessbauer@siemens.com \
--cc=christian.storm@siemens.com \
--cc=isar-users@googlegroups.com \
--cc=tobias.preclik@siemens.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox