minor bug of startvde

Author: chaoseternal

bin/createkvm

@@ -43,20 +43,33 @@ do
     if [ -e "$VMNAME" -o -z "$VMNAME" ] 
     then
 	$DIALOG --title "VMNAME:ERROR" --msgbox "ERROR! The name already exists, or the input is null!" 10 30
+	if [ -d "$VMNAME" -a -e "$VMNAME"/startvm ]
+	    then
+	    $DIALOG --title "Update" --yesno "Update existing VM settings?" 10 30
+	    if [ $? == 0 ]
+		then 
+		UPDATEVM=1
+		break
+	    fi
+	fi
     else
 	break
     fi
 done
 
-if mkdir $VMNAME&&cd $VMNAME
+if [ ! x$UPDATEVM = x1 ]
 then
-    $DIALOG --title "CreateKVM" --msgbox "VM dir create OK!" 10 30
+    if mkdir $VMNAME&&cd $VMNAME
+    then
+	$DIALOG --title "CreateKVM" --msgbox "VM dir create OK!" 10 30
+    else
+	$DIALOG --title "FATAL" --msgbox "Can't create the VM dir, exiting" 10 30
+	exit
+    fi
 else
-    $DIALOG --title "FATAL" --msgbox "Can't create the VM dir, exiting" 10 30
-    exit
+    cd $VMNAME
 fi
 
-
 VMMEMFILE=`mktemp`
 $DIALOG --title Memsize --inputbox "Input size of memory of the new vm, in M" 10 40 256M 2>$VMMEMFILE
 VMMEM=`cat $VMMEMFILE`

bin/startvde

@@ -6,6 +6,7 @@ LOCK_F="./vdeswitch.lck"
 CTSOCK=`readlink -f ./vde1`
 PIDFILE="`pwd`/nic1.pid"
 MGMTFILE="`pwd`/nic1.mgmt"
+USERNAME=${USERNAME-$USER}
 HOSTTAP=hst-$USERNAME
 HOSTADDR=172.17.10.254
 HOSTMASK=255.255.255.0
@@ -28,5 +29,5 @@ NATTAP=nat-$USERNAME
 
 vde_switch -s $CTSOCK -n 4 -p "$PIDFILE" -daemon -M "$MGMTFILE"
 sudo vde_tunctl -u $USERNAME -t "$HOSTTAP"
-sudo ifconfig "$HOSTTAP" "$HOSTADDR" "$HOSTMASK" up
+sudo /sbin/ifconfig "$HOSTTAP" "$HOSTADDR" netmask "$HOSTMASK" up
 vde_plug2tap -d -s $CTSOCK "$HOSTTAP"