update

1 files changed, 21 insertions, 8 deletions

diff --git a/bin/vm b/bin/vm
index e8f7684..83ce0ea 100755
--- a/bin/vm
+++ b/bin/vm
@@ -1,12 +1,12 @@
 #!/bin/sh
 
-# vm is a tool to manage and operate virtual machines.
+# vm is a command line tool to  manage and operate virtual machines.
 
 vm_version='vm-0.1'
 
 # TODO:
 # - DONE: fetch, build and install vftool in .vm/vftool
-# - setup a config file per VM
+# - DONE: setup a config file per VM
 # - creation of hdd image
 # - script install from CDROM iso:
 #	- setup system, including static IP address
@@ -61,7 +61,7 @@ iso_url = https://dl-cdn.alpinelinux.org/alpine/v3.13/releases/aarch64/alpine-vi
 iso = $(notdir $(iso_url))
 isoinfo ?= /opt/homebrew/bin/isoinfo
 
-all: initrd vmlinux
+all: initrd vmlinux config
 
 initrd: $(iso) $(isoinfo)
 	isoinfo -i $(iso) -J -x /boot/initramfs-virt > $@
@@ -69,9 +69,11 @@ initrd: $(iso) $(isoinfo)
 vmlinux: $(iso) $(isoinfo)
 	isoinfo -i $(iso) -J -x /boot/vmlinuz-virt | gunzip > $@
 
+config: $(iso)
+	@echo "iso=$(iso)" >config
+
 $(iso):
 	curl -LO $(iso_url) || { rm -f $@; false; }
-	ln -sf $(iso) iso
 
 $(isoinfo):
 	brew install cdrtools
@@ -79,7 +81,7 @@ $(isoinfo):
 
 init_alpine() {
 	mkdir -p "$dir/alpine-iso"  && cd "$dir/alpine-iso" || die 'init alpine failed'
-	[ -f 'Makefile' ] || echo "$alpine_makefile" > Makefile
+	[ -f 'Makefile' ] || printf "%s" "$alpine_makefile" > Makefile
 	make -s all
 }
 
@@ -129,10 +131,21 @@ start() {
 }
 
 start_vm() (
-        trap 'rm -f vftool.pid' EXIT
         [ -f vftool.log ] && cat vftool.log >> vftool.log.old
-        "$dir/vftool" -k vmlinux -i initrd -c iso >vftool.log 2>&1 & sleep 1
-	exec 1>>vftool.log 2>&1
+	exec 1>vftool.log 2>&1
+	. config || die "vm: could not source $PWD/config"
+        trap 'rm -f vftool.pid' EXIT
+
+        "$dir/vftool" \
+		-k vmlinux \
+		-i initrd \
+		${iso+-c "$iso"} \
+		${hdd+-d "$hdd"} \
+		${cpu+-p "$cpu"} \
+		${ram+-m "$ram"} \
+		${arg+-m "$arg"} \
+		>>vftool.log 2>&1 & sleep 1
+
         echo "$!" >vftool.pid
         screen -S "${PWD##*/}" -d -m "$(grep -om 1 '\/dev\/tty.*' vftool.log)"
         wait