update

1 files changed, 23 insertions, 3 deletions

diff --git a/bin/vm b/bin/vm
index 83ce0ea..0eaa921 100755
--- a/bin/vm
+++ b/bin/vm
@@ -8,6 +8,7 @@ vm_version='vm-0.1'
 # - DONE: fetch, build and install vftool in .vm/vftool
 # - DONE: setup a config file per VM
 # - creation of hdd image
+# - import iso, kernel, initrd from existing vm
 # - script install from CDROM iso:
 #	- setup system, including static IP address
 # 	- setup user account from host
@@ -20,13 +21,31 @@ export LC_ALL=C IFS='
 '
 
 add() {
-	usage 'add name' 'Add a new VM' && return
+	usage 'add [Options] name' 'Add a new VM' && return
+	while getopts :c:p:s: opt; do
+		case $opt in
+		c|k|p|s) eval "$opt=$OPTARG";;
+		*) Opth=1 add; exit ;;
+		esac
+	done
+	shift $((OPTIND - 1))
+
 	[ -d "$dir/$1" ] && die "vm $1 already exists in $dir/$1"
 	init_alpine || die "could not init alpine iso"
 	mkdir -p "$dir/$1" && cd "$dir/$1" || die "add $1 failed"
-	pwd
+	hdd=${p-$1.raw}
+	[ -f "$hdd" ] || dd if=/dev/zero of=$hdd bs=1 count=0 seek=${s-32g} 2>/dev/null
+	echo "hdd=\"$hdd\"" > config
+	[ "$c" ] && {
+		[ -d "../$c" ] || die "invalid directory: $dir/$c"
+		iso=$(getconf "$c" iso)
+		[ "$iso" ] && echo "iso=\"../$c/$iso\"" >> config
+		cp "../$c/vmlinux" "../$c/initrd" .
+	}
 }
 
+getconf() { awk -F '=' -v k="$2" '$1 == k {print $2}' "$dir/$1/config"; }
+
 console() {
 	usage 'console name' 'Attach a console to a VM' && return
 	[ "$1" ] || die 'console: name is missing'
@@ -128,6 +147,7 @@ start() {
 	cd "$dir/$1" || die "start $1 failed"
 	[ -f vftool.pid ] && die "Error: process $(cat vftool.pid) is active or $PWD/vftool.pid should be removed"
 	start_vm &
+	[ "$attach" ] && sleep 1 && vm console $1
 }
 
 start_vm() (
@@ -139,8 +159,8 @@ start_vm() (
         "$dir/vftool" \
 		-k vmlinux \
 		-i initrd \
-		${iso+-c "$iso"} \
 		${hdd+-d "$hdd"} \
+		${iso+-c "$iso"} \
 		${cpu+-p "$cpu"} \
 		${ram+-m "$ram"} \
 		${arg+-m "$arg"} \