[Lxm-commits-diff] SF.net SVN: lxm:[14] kvm-based/trunk

[<ou...@us...>]

Revision: 14
          http://lxm.svn.sourceforge.net/lxm/?rev=14&view=rev
Author:   outchy
Date:     2010-01-07 17:46:42 +0000 (Thu, 07 Jan 2010)

Log Message:
-----------
customization of "ifname".
"vlan" should be an integer.

Modified Paths:
--------------
    kvm-based/trunk/bash_scripts/kvm-start
    kvm-based/trunk/gdm/Sessions/sample.desktop

Modified: kvm-based/trunk/bash_scripts/kvm-start
===================================================================
--- kvm-based/trunk/bash_scripts/kvm-start	2009-11-24 21:17:17 UTC (rev 13)
+++ kvm-based/trunk/bash_scripts/kvm-start	2010-01-07 17:46:42 UTC (rev 14)
@@ -204,9 +204,14 @@
 
 KVM_VLAN=`ini_get_value "KVM" "kvmvlan"`
 if [ -z "$KVM_VLAN" ]; then
-  KVM_VLAN=$KVM_NAME
+  KVM_VLAN=0
 fi
 
+KVM_IFNAME=`ini_get_value "KVM" "kvmifname"`
+if [ -z "$KVM_IFNAME" ]; then
+  KVM_IFNAME="$KVM_NAME"
+fi
+
 INDEX=1
 while true; do
   KVM_MAC="00:16:3E:01:23:$[$INDEX/10]$[$INDEX%10]"
@@ -225,7 +230,7 @@
 	KVM="$KVM -net none"
 	;;
 user)
-	KVM="$KVM -net nic,vlan=$KVM_VLAN,macaddr=$KVM_MAC -net user,vlan=$KVM_VLAN"
+	KVM="$KVM -net nic,vlan=$KVM_VLAN,macaddr=$KVM_MAC -net user,vlan=$KVM_IFNAME"
 	;;
 auto)
 	KVM="$KVM -net nic,vlan=$KVM_VLAN,macaddr=$KVM_MAC -net tap,vlan=$KVM_VLAN,ifname=$KVM_NAME"

Modified: kvm-based/trunk/gdm/Sessions/sample.desktop
===================================================================
--- kvm-based/trunk/gdm/Sessions/sample.desktop	2009-11-24 21:17:17 UTC (rev 13)
+++ kvm-based/trunk/gdm/Sessions/sample.desktop	2010-01-07 17:46:42 UTC (rev 14)
@@ -78,6 +78,7 @@
 # network options (auto,user or none)
 kvmnet=auto
 # default to <Name>
+kvmifname=
 kvmvlan=
 kvmtftp=
 kvmbootp=


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.