From ce1dd127fc892083318754f857dec6cf9579aae2 Mon Sep 17 00:00:00 2001 From: Stefano Brivio Date: Wed, 6 Apr 2022 15:21:19 +0200 Subject: 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 --- mbuto | 12 +++++------- 1 file 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} -- cgit v1.2.3