aboutgitcode
diff options
context:
space:
mode:
authorStefano Brivio <sbrivio@redhat.com>2022-04-06 15:21:19 +0200
committerStefano Brivio <sbrivio@redhat.com>2022-04-06 15:34:27 +0200
commitce1dd127fc892083318754f857dec6cf9579aae2 (patch)
treeee0acea9127ca35fb93dfeabd521697dc8afb167
parent43ccf26da3056691e23c031023397842808674ff (diff)
downloadmbuto-ce1dd127fc892083318754f857dec6cf9579aae2.tar
mbuto-ce1dd127fc892083318754f857dec6cf9579aae2.tar.gz
mbuto-ce1dd127fc892083318754f857dec6cf9579aae2.tar.bz2
mbuto-ce1dd127fc892083318754f857dec6cf9579aae2.tar.lz
mbuto-ce1dd127fc892083318754f857dec6cf9579aae2.tar.xz
mbuto-ce1dd127fc892083318754f857dec6cf9579aae2.tar.zst
mbuto-ce1dd127fc892083318754f857dec6cf9579aae2.zip
mbuto: Fix up some issues from profile restructuring
Make indentation of FIXUP definitions consistent. Add /usr/local/bin to PATH, and drop device nodes the 'passt' profile doesn't need. Signed-off-by: Stefano Brivio <sbrivio@redhat.com>
-rwxr-xr-xmbuto12
1 files changed, 5 insertions, 7 deletions
diff --git a/mbuto b/mbuto
index 285a8d3..70b2381 100755
--- a/mbuto
+++ b/mbuto
@@ -50,7 +50,7 @@ THREADS="$(nproc)"
# Fix-up script to run before /init, can be omitted
[ -z "${FIXUP}" ] && FIXUP='#!/bin/sh
-export PATH=/bin:/usr/bin:/sbin:/usr/sbin
+export PATH=/bin:/usr/bin:/sbin:/usr/sbin:/usr/local/bin
mount -t proc proc /proc
mount -t sysfs sys /sys
@@ -130,7 +130,7 @@ profile_kata() {
mkdir /sys/fs/cgroup/${t}
mount -o rw,${t} -t cgroup cgroup /sys/fs/cgroup/${t}
done
- '
+'
OUTPUT="Kata Containers [hypervisor.qemu] configuration:
@@ -151,9 +151,9 @@ profile_kata_debug() {
ash,dash,bash /bin/sh"
FIXUP="${FIXUP}
- echo Starting interactive shell, exit to spawn kata-agent
- sh +m
- "
+ echo Starting interactive shell, exit to spawn kata-agent
+ sh +m
+"
}
# Profile for passt (https://passt.top) tests
@@ -171,8 +171,6 @@ profile_passt() {
ash,dash,bash /bin/sh
ash,dash,bash /usr/bin/bash}"
- NODES="${NODES} tty ttyS0"
-
DIRS="${DIRS} /tmp"
COPIES="${COPIES}