[pve-devel] r5328 - qemu-server/trunk

[svn-commits at proxmox.com]

Author: dietmar
Date: 2010-12-03 14:11:22 +0100 (Fri, 03 Dec 2010)
New Revision: 5328

Modified:
   qemu-server/trunk/QemuServer.pm
   qemu-server/trunk/bridge-vlan
   qemu-server/trunk/changelog.Debian
Log:


Modified: qemu-server/trunk/QemuServer.pm
===================================================================
--- qemu-server/trunk/QemuServer.pm	2010-12-03 13:08:02 UTC (rev 5327)
+++ qemu-server/trunk/QemuServer.pm	2010-12-03 13:11:22 UTC (rev 5328)
@@ -1407,7 +1407,7 @@
 
 	    $foundnet = 1;
 
-	    my $ifname = "vt${vmid}i$i";
+	    my $ifname = "tap${vmid}i$i";
 
 	    if ($vernum < 13000) {
 		push @$cmd, '-net', "tap,vlan=$i,ifname=$ifname,script=/var/lib/qemu-server/bridge-vlan";

Modified: qemu-server/trunk/bridge-vlan
===================================================================
--- qemu-server/trunk/bridge-vlan	2010-12-03 13:08:02 UTC (rev 5327)
+++ qemu-server/trunk/bridge-vlan	2010-12-03 13:11:22 UTC (rev 5328)
@@ -7,7 +7,7 @@
 die "no interface specified\n" if !$iface;
 
 die "got strange interface name '$iface'\n" 
-    if $iface !~ m/^vt(\d+)i(\d+)(d\d+)?$/;
+    if $iface !~ m/^tap(\d+)i(\d+)(d\d+)?$/;
 
 my $vmid = $1;
 my $vlan = $2;

Modified: qemu-server/trunk/changelog.Debian
===================================================================
--- qemu-server/trunk/changelog.Debian	2010-12-03 13:08:02 UTC (rev 5327)
+++ qemu-server/trunk/changelog.Debian	2010-12-03 13:11:22 UTC (rev 5328)
@@ -1,7 +1,7 @@
 qemu-server (1.1-26) unstable; urgency=low
 
-  * change tab device nameing from "vmtab${vmid}..." to "vt${vmid}...",
-  that is 3 letters shorter (tab interface names are limited to 15 characters)
+  * change tab device nameing from "vmtab${vmid}..." to "tap${vmid}...",
+  that is 2 letters shorter (tab interface names are limited to 15 characters)
 
  -- Proxmox Support Team <support at proxmox.com>  Fri, 03 Dec 2010 14:02:30 +0100