[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v3 10/15] grub-shell: Add $GRUB_QEMU_OPTS to run.sh to easily see
From: |
Glenn Washburn |
Subject: |
[PATCH v3 10/15] grub-shell: Add $GRUB_QEMU_OPTS to run.sh to easily see unofficial QEMU arguments |
Date: |
Thu, 10 Feb 2022 15:51:27 -0600 |
Signed-off-by: Glenn Washburn <development@efficientek.com>
---
tests/util/grub-shell.in | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/tests/util/grub-shell.in b/tests/util/grub-shell.in
index 48c7fde48..fdabc6171 100644
--- a/tests/util/grub-shell.in
+++ b/tests/util/grub-shell.in
@@ -74,7 +74,7 @@ exec_show_error () {
work_directory=${WORKDIR:-`mktemp -d "${TMPDIR:-/tmp}/grub-shell.XXXXXXXXXX"`}
|| exit 1
. "${builddir}/grub-core/modinfo.sh"
-qemuopts="${GRUB_QEMU_OPTS}"
+qemuopts=
serial_port=com0
serial_null=
halt_cmd=halt
@@ -513,7 +513,8 @@ if [ x$boot = xnet ]; then
[ -z "$files" ] || copy_extra_files "$netdir" $files
cat >"$work_directory/run.sh" <<EOF
#! @BUILD_SHEBANG@
-exec "${qemu}" ${qemuopts} ${serial_null} -serial file:/dev/stdout -boot n
-net
"user,tftp=$netdir,bootfile=/boot/grub/${grub_modinfo_target_cpu}-${grub_modinfo_platform}/core.$netbootext"
-net nic
+GRUB_QEMU_OPTS=\${GRUB_QEMU_OPTS:-"$GRUB_QEMU_OPTS"}
+exec "${qemu}" ${qemuopts} \${GRUB_QEMU_OPTS} ${serial_null} -serial
file:/dev/stdout -boot n -net
"user,tftp=$netdir,bootfile=/boot/grub/${grub_modinfo_target_cpu}-${grub_modinfo_platform}/core.$netbootext"
-net nic
EOF
elif [ x$boot = xemu ]; then
rootdir="$work_directory/rootdir"
@@ -541,8 +542,9 @@ else
cat >"$work_directory/run.sh" <<EOF
#! @BUILD_SHEBANG@
SDIR=\$(realpath -e \${0%/*})
+GRUB_QEMU_OPTS=\${GRUB_QEMU_OPTS:-"$GRUB_QEMU_OPTS"}
cd "\$SDIR"
-exec "${qemu}" ${qemuopts} ${serial_null} -serial file:/dev/stdout
-${device}"\${SDIR}/${isofile##*/}" ${bootdev}
+exec "${qemu}" ${qemuopts} \${GRUB_QEMU_OPTS} ${serial_null} -serial
file:/dev/stdout -${device}"\${SDIR}/${isofile##*/}" ${bootdev}
EOF
fi
--
2.27.0
- [PATCH v3 00/15] Grub-shell improvements, Glenn Washburn, 2022/02/10
- [PATCH v3 01/15] grub-shell: Allow specifying non-default trim line contents, Glenn Washburn, 2022/02/10
- [PATCH v3 02/15] grub-shell: Trim line should always be matched from the beginning of the line, Glenn Washburn, 2022/02/10
- [PATCH v3 03/15] grub-shell: Only show grub-mkrescue output if it returns an error, Glenn Washburn, 2022/02/10
- [PATCH v3 04/15] grub-shell: Allow setting default timeout via GRUB_SHELL_DEFAULT_TIMEOUT envvar, Glenn Washburn, 2022/02/10
- [PATCH v3 05/15] grub-shell: Put all generated files into working dir and use better file names, Glenn Washburn, 2022/02/10
- [PATCH v3 06/15] grub-shell: Add grub output logfile with grub-shell --debug, Glenn Washburn, 2022/02/10
- [PATCH v3 07/15] grub-shell: Set exit status to qemu exit status, Glenn Washburn, 2022/02/10
- [PATCH v3 08/15] grub-shell: Only cleanup working directory file if QEMU does not fail or timeout, Glenn Washburn, 2022/02/10
- [PATCH v3 09/15] grub-shell: Create run.sh in working directory for easily running test again, Glenn Washburn, 2022/02/10
- [PATCH v3 10/15] grub-shell: Add $GRUB_QEMU_OPTS to run.sh to easily see unofficial QEMU arguments,
Glenn Washburn <=
- [PATCH v3 11/15] tests: Allow turning on shell tracing from environment variables, Glenn Washburn, 2022/02/10
- [PATCH v3 12/15] grub-shell: Add --verbose to mkrescue when $debug is greater than 2, Glenn Washburn, 2022/02/10
- [PATCH v3 14/15] grub-shell: Use malta qemu-mips machine type instead off non-existant indy, Glenn Washburn, 2022/02/10
- [PATCH v3 13/15] grub-shell: Only turn on qemu head when large debug value is specified, Glenn Washburn, 2022/02/10
- [PATCH v3 15/15] grub-shell: Add flexibility in QEMU firmware handling, Glenn Washburn, 2022/02/10