From ae17c433148364af195d96d2b4baaf3702849d4c Mon Sep 17 00:00:00 2001 From: Pavel 'LEdoian' Turinsky Date: Fri, 21 Feb 2025 16:51:38 +0100 Subject: [PATCH] VM now boots --- init.sh | 4 +++- machines/loc1xe/vm1/create.sh | 4 +++- machines/loc1xe/vm1/start.sh | 4 +++- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/init.sh b/init.sh index 5605322..99d0d6d 100755 --- a/init.sh +++ b/init.sh @@ -6,6 +6,8 @@ set -eu mount -t tmpfs -o size=100M horror ./state +tmux new-session -t nethorror -d + # TODO: Set some sysctls in order not to interact with the networks for net in networks/*; do @@ -16,4 +18,4 @@ for mach in machines/*; do $mach/run-shim.sh done -tmux +tmux -N attach diff --git a/machines/loc1xe/vm1/create.sh b/machines/loc1xe/vm1/create.sh index 54563a9..54c6dcb 100755 --- a/machines/loc1xe/vm1/create.sh +++ b/machines/loc1xe/vm1/create.sh @@ -2,11 +2,13 @@ # LEdoian's absurdly simple initrd generator (ad-hoc arc) +here="$(dirname "$0")" + set -eu outdir="$1" mkdir "$outdir/initrd" -cp init "$outdir/initrd/" +cp "$here/init" "$outdir/initrd/" busybox="$(which busybox)" cp "$busybox" "$outdir/initrd/busybox" diff --git a/machines/loc1xe/vm1/start.sh b/machines/loc1xe/vm1/start.sh index 9e4208c..80e33b8 100755 --- a/machines/loc1xe/vm1/start.sh +++ b/machines/loc1xe/vm1/start.sh @@ -2,5 +2,7 @@ . ./lib.shs +set -eu + mkdir state/$mach/initdir -tmux new-window -d vm1 sh -c machines/$mach/vm1/create.sh state/$mach/initdir \&\& machines/$mach/vm1/run.sh state/$mach/initdir +tmux new-window -d -n vm1 sh -c "machines/$mach/vm1/create.sh state/$mach/initdir && machines/$mach/vm1/run.sh state/$mach/initdir"