From 6c532de11cb38d4d85a4692dbc531031d6840aa4 Mon Sep 17 00:00:00 2001
From: Jamie McClelland <jm@mayfirst.org>
Date: Mon, 12 Oct 2009 11:06:07 -0400
Subject: breaking out the name of the disk and placing it in a env file called
 kvmopts which is passed directly to kvm command.

---
 kvm-creator | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'kvm-creator')

diff --git a/kvm-creator b/kvm-creator
index ff51243..8cb34fc 100755
--- a/kvm-creator
+++ b/kvm-creator
@@ -12,6 +12,7 @@ NAME="$1"
 VG="$2"
 SIZE="${3:-3G}"
 RAM="${4:-512}"
+DISK="/dev/mapper/${VG}-${NAME}"
 
 [ "$CMD" == "create" ] && [ ! -d /etc/sv/kvm ] && mkdir /etc/sv/kvm
 
@@ -60,7 +61,7 @@ validate() {
   [ "$?" -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."
+  [ -e $DISK ] && die "The logical volume $NAME already exists."
 
 }
 
@@ -101,13 +102,14 @@ EOF
     echo "$TAP" > "/etc/sv/kvm/$NAME/env/TAP"
     echo "$RAM" > "/etc/sv/kvm/$NAME/env/RAM"
     echo "$MAC" > "/etc/sv/kvm/$NAME/env/MAC"
+		echo "$DISK" > "/etc/sv/kvm/$NAME/env/KVMOPTS"
 
 }
 
 demo() {
 
     validate
-    for foo in NAME VG TAP RAM MAC SIZE ; do
+    for foo in NAME VG TAP RAM MAC SIZE DISK ; do
       echo "$foo : ${!foo}"
     done
 
-- 
cgit v1.2.3