[pve-devel] r5298 - vzdump/trunk

[svn-commits at proxmox.com]

Author: dietmar
Date: 2010-11-08 09:56:41 +0000 (Mon, 08 Nov 2010)
New Revision: 5298

Modified:
   vzdump/trunk/ChangeLog
   vzdump/trunk/Makefile
   vzdump/trunk/vzrestore
Log:


Modified: vzdump/trunk/ChangeLog
===================================================================
--- vzdump/trunk/ChangeLog	2010-11-08 07:00:31 UTC (rev 5297)
+++ vzdump/trunk/ChangeLog	2010-11-08 09:56:41 UTC (rev 5298)
@@ -1,3 +1,8 @@
+2010-11-08  Proxmox Support Team  <support at proxmox.com>
+
+	* vzrestore (restore_openvz): correctly replace
+	host_ifname=veth$vmid
+
 2010-10-04  Proxmox Support Team  <support at proxmox.com>
 
 	* VZDump.pm (exec_backup_task): added new hook 'log-end' - called

Modified: vzdump/trunk/Makefile
===================================================================
--- vzdump/trunk/Makefile	2010-11-08 07:00:31 UTC (rev 5297)
+++ vzdump/trunk/Makefile	2010-11-08 09:56:41 UTC (rev 5298)
@@ -13,7 +13,7 @@
 
 VERSION=1.2
 PACKAGE=vzdump
-PKGREL=8
+PKGREL=9
 
 #ARCH:=$(shell dpkg-architecture -qDEB_BUILD_ARCH)
 #RPMARCH:=$(shell rpm --eval %_build_arch)

Modified: vzdump/trunk/vzrestore
===================================================================
--- vzdump/trunk/vzrestore	2010-11-08 07:00:31 UTC (rev 5297)
+++ vzdump/trunk/vzrestore	2010-11-08 09:56:41 UTC (rev 5298)
@@ -107,7 +107,7 @@
 	my $qprivate = $vzconf->{privatedir};
 	$qprivate =~ s|/|\\\/|g;
 
-	my $scmd = "sed -e 's/VE_ROOT=.*/VE_ROOT=\\\"$qroot\\\"/' -e 's/VE_PRIVATE=.*/VE_PRIVATE=\\\"$qprivate\\\"/'  <'$private/etc/vzdump/vps.conf' >'$conffile'";
+	my $scmd = "sed -r -e 's/VE_ROOT=.*/VE_ROOT=\\\"$qroot\\\"/' -e 's/VE_PRIVATE=.*/VE_PRIVATE=\\\"$qprivate\\\"/' -e 's/host_ifname=veth[0-9]+\./host_ifname=veth${vmid}./' <'$private/etc/vzdump/vps.conf' >'$conffile'";
 
 	run_command ($scmd);