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

[svn-commits at proxmox.com]

Author: dietmar
Date: 2010-12-09 09:07:46 +0100 (Thu, 09 Dec 2010)
New Revision: 5339

Modified:
   qemu-server/trunk/ChangeLog
   qemu-server/trunk/Makefile
   qemu-server/trunk/QemuServer.pm
   qemu-server/trunk/changelog.Debian
Log:


Modified: qemu-server/trunk/ChangeLog
===================================================================
--- qemu-server/trunk/ChangeLog	2010-12-07 11:54:16 UTC (rev 5338)
+++ qemu-server/trunk/ChangeLog	2010-12-09 08:07:46 UTC (rev 5339)
@@ -1,3 +1,7 @@
+2010-12-09  Proxmox Support Team  <support at proxmox.com>
+
+	* QemuServer.pm (config_to_command): fix bug in network device naming
+
 2010-12-06  Proxmox Support Team  <support at proxmox.com>
 
 	* VZDump::QemuServer.pm (archive): support new --stdout option (as

Modified: qemu-server/trunk/Makefile
===================================================================
--- qemu-server/trunk/Makefile	2010-12-07 11:54:16 UTC (rev 5338)
+++ qemu-server/trunk/Makefile	2010-12-09 08:07:46 UTC (rev 5339)
@@ -2,7 +2,7 @@
 
 VERSION=1.1
 PACKAGE=qemu-server
-PKGREL=27
+PKGREL=28
 
 DESTDIR=
 PREFIX=/usr

Modified: qemu-server/trunk/QemuServer.pm
===================================================================
--- qemu-server/trunk/QemuServer.pm	2010-12-07 11:54:16 UTC (rev 5338)
+++ qemu-server/trunk/QemuServer.pm	2010-12-09 08:07:46 UTC (rev 5339)
@@ -1407,14 +1407,15 @@
 
 	    $foundnet = 1;
 
-	    my $ifname = "tap${vmid}i$i";
+	    my $baseifname = "tap${vmid}i$i";
 
 	    if ($vernum < 13000) {
-		push @$cmd, '-net', "tap,vlan=$i,ifname=$ifname,script=/var/lib/qemu-server/bridge-vlan";
+		push @$cmd, '-net', "tap,vlan=$i,ifname=$baseifname,script=/var/lib/qemu-server/bridge-vlan";
 	    }
 
 	    my $j = 0;
 	    foreach my $nic (@{$vlan->{nics}}) {
+		my $ifname = $baseifname;
 		my $device = $nic->{model};
 		my $vhostparam = '';
 		if ($nic->{model} eq 'virtio') {

Modified: qemu-server/trunk/changelog.Debian
===================================================================
--- qemu-server/trunk/changelog.Debian	2010-12-07 11:54:16 UTC (rev 5338)
+++ qemu-server/trunk/changelog.Debian	2010-12-09 08:07:46 UTC (rev 5339)
@@ -1,3 +1,9 @@
+qemu-server (1.1-28) unstable; urgency=low
+
+  * fix bug in network device naming
+
+ -- Proxmox Support Team <support at proxmox.com>  Thu, 09 Dec 2010 09:05:32 +0100
+
 qemu-server (1.1-27) unstable; urgency=low
 
   * support new vzdump --stdout option