|
 |
f07426 |
From 8d631f17e11d6c9f1c01eb0dc1cb104ac45e63ac Mon Sep 17 00:00:00 2001
|
|
|
f07426 |
From: Stefano Brivio <sbrivio@redhat.com>
|
|
|
f07426 |
Date: Mon, 27 Feb 2023 03:44:25 +0100
|
|
|
f07426 |
Subject: [PATCH 08/20] doc/demo: Fix and suppress ShellCheck warnings
|
|
|
f07426 |
|
|
|
f07426 |
ShellCheck reports (SC2034) that __qemu_arch is not used. Use it,
|
|
|
f07426 |
and silence the resulting SC2086 warning as we want word splitting on
|
|
|
f07426 |
options we pass with it.
|
|
|
f07426 |
|
|
|
f07426 |
While at it, silence SC2317 warnings for commands in cleanup() that
|
|
|
f07426 |
appear to be unreachable: cleanup() is only called as trap.
|
|
|
f07426 |
|
|
|
f07426 |
Signed-off-by: Stefano Brivio <sbrivio@redhat.com>
|
|
|
f07426 |
Reviewed-by: David Gibson <david@gibson.dropbear.id.au>
|
|
|
f07426 |
(cherry picked from commit fb05a713789fd9c20d0432f023ce26f3c5b94251)
|
|
|
f07426 |
---
|
|
|
f07426 |
doc/demo.sh | 4 +++-
|
|
|
f07426 |
1 file changed, 3 insertions(+), 1 deletion(-)
|
|
|
f07426 |
|
|
|
f07426 |
diff --git a/doc/demo.sh b/doc/demo.sh
|
|
|
f07426 |
index ed71ffb..5b05ddf 100755
|
|
|
f07426 |
--- a/doc/demo.sh
|
|
|
f07426 |
+++ b/doc/demo.sh
|
|
|
f07426 |
@@ -110,6 +110,7 @@ next() {
|
|
|
f07426 |
}
|
|
|
f07426 |
|
|
|
f07426 |
# cleanup() - Terminate pasta and passt, clean up, restore TTY settings
|
|
|
f07426 |
+# shellcheck disable=SC2317
|
|
|
f07426 |
cleanup() {
|
|
|
f07426 |
[ -f "${DEMO_DIR}/pasta.pid" ] && kill "$(cat "${DEMO_DIR}/pasta.pid")"
|
|
|
f07426 |
[ -f "${DEMO_DIR}/passt.pid" ] && kill "$(cat "${DEMO_DIR}/passt.pid")"
|
|
|
f07426 |
@@ -223,7 +224,8 @@ into_ns() {
|
|
|
f07426 |
echo "Use ^C to terminate it."
|
|
|
f07426 |
next
|
|
|
f07426 |
|
|
|
f07426 |
- cmd qrap 5 qemu-system-x86_64 -M pc,accel=kvm:tcg \
|
|
|
f07426 |
+ # shellcheck disable=SC2086
|
|
|
f07426 |
+ cmd qrap 5 ${__qemu_arch} \
|
|
|
f07426 |
-smp "$(nproc)" -m 1024 \
|
|
|
f07426 |
-nographic -serial stdio -nodefaults -no-reboot -vga none \
|
|
|
f07426 |
-initrd "${DEMO_DIR}/demo.img" \
|
|
|
f07426 |
--
|
|
|
f07426 |
2.39.2
|
|
|
f07426 |
|