1 files changed, 56 insertions, 13 deletions
diff --git a/kvm-creator b/kvm-creator
index 6ea989f..ff51243 100755
--- a/kvm-creator
+++ b/kvm-creator
@@ -1,5 +1,5 @@
 #!/bin/bash
-set -x
+#set -x
 
 # Author: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
 # Date: 2009-10-08
@@ -9,12 +9,35 @@ CMD="$1"
 shift
 
 NAME="$1"
-SIZE="${2:-3G}"
-RAM="${3:-512}"
-TAP="${4:-$(( $( cat /etc/sv/kvm/*/env/TAP | sed 's/^tap//' | sort -n  | tail -n 1 ) + 1 ))}"
-MAC="${5:-$(cat /etc/sv/kvm/*/env/MAC | head -n1 | cut -f 1-5 -d: ):$(( $( cat /etc/sv/kvm/*/env/MAC | cut -f 6 -d:  | sort -n  | tail -n 1 ) + 1 ))}"
+VG="$2"
+SIZE="${3:-3G}"
+RAM="${4:-512}"
 
-VG=vg_malty0
+[ "$CMD" == "create" ] && [ ! -d /etc/sv/kvm ] && mkdir /etc/sv/kvm
+
+ls /etc/sv/kvm/* &> /dev/null
+if [ "$?" -eq 0 ]; then
+  TAP="${5:-tap$(( $( cat /etc/sv/kvm/*/env/TAP | sed 's/^tap//' | sort -n  | tail -n 1 ) + 1 ))}"
+  MAC="${6:-$(cat /etc/sv/kvm/*/env/MAC | head -n1 | cut -f 1-5 -d: ):$(( $( cat /etc/sv/kvm/*/env/MAC | cut -f 6 -d:  | sort -n  | tail -n 1 ) + 1 ))}"
+else
+  TAP=tap0
+  MAC=00:00:00:00:00:00
+fi
+
+usage() {
+
+	die "USAGE: kvm-creator create|destroy|demo guestname [volumegroup [disksize [ram [tap [mac] ] ] ] ]"
+
+}
+
+die() {
+
+  echo "$1"
+  exit_code=1
+  [ -n "$2" ] && exit_code="$2"
+  exit $exit_code
+
+}
 
 destroy() {
 
@@ -26,14 +49,30 @@ destroy() {
 
 }
 
-create() {
-    set -e
+validate() {
+
+  # Make sure none of the pieces already exist.
+  [ -z "$NAME" ] && die "Please pass the name of the virtual server to create"
+  [ -z "$VG" ] && [ "$CMD" == "create" ] && die "Please pass the name of the volume group to use"
+  getent passwd "$NAME" > /dev/null
+  [ "$?" -eq "0" ] && die "The username '$NAME' already exists."
+  getent group "$NAME" > /dev/null
+  [ "$?" -eq 0 ] && die "The group '$NAME' already exists."
+  [ -d /home/"$NAME" ] && die "The directory '/home/$NAME' already exists."
+  [ -d /etc/sv/kvm/"$NAME" ] && die "The directory '/etc/sv/kvm/$NAME' already exists."
+  [ -d /dev/mapper/${VG}-${NAME} ] && die "The logical volume $NAME already exists."
 
-# FIXME: check that this stuff doesn't exist yet:
+}
+
+create() {
 
+    set -e
+    validate
     adduser "$NAME" --disabled-password --gecos "$NAME KVM user,,,"
-    mkdir "/home/$NAME/"{.ssh,vms,"vms/$NAME"}
-    touch "/home/$NAME/vms/$NAME/netboot"
+    addgroup "$NAME" kvm
+    for dir in .ssh vms "vms/$NAME"; do
+      [ ! -d "/home/$NAME/$dir" ] && mkdir "/home/$NAME/$dir"
+    done
     chown "$NAME:$NAME" "/home/$NAME/"{.ssh,vms,"vms/$NAME","vms/$NAME/netboot"}
     cp /root/.ssh/authorized_keys "/home/$NAME/.ssh/"
     lvcreate --name "$NAME" --size "$SIZE" $VG
@@ -67,9 +106,13 @@ EOF
 
 demo() {
 
-    for foo in NAME TAP RAM MAC SIZE ; do
-	echo "$foo : ${!foo}"
+    validate
+    for foo in NAME VG TAP RAM MAC SIZE ; do
+      echo "$foo : ${!foo}"
     done
+
 }
 
+[ "$CMD" != "create" ] && [ "$CMD" != "destroy" ] && [ "$CMD" != "demo" ] && usage
+
 "$CMD"