From: Dietmar Maurer <dietmar@proxmox.com>
Date: Tue, 6 Mar 2012 06:42:43 +0000 (+0100)
Subject: do not backup empty dir
X-Git-Url: https://git.proxmox.com/?p=vzctl.git;a=commitdiff_plain;h=254cb814c6320bece03db51c44d8a72ad1135ab0

do not backup empty dir
---

diff --git a/Makefile b/Makefile
index 5332fce..81d95e8 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
 RELEASE=2.0
 
 SVER=3.0.30
-PACKAGERELEASE=2pve1
+PACKAGERELEASE=2pve2
 ARCH=amd64
 
 PACKAGE=vzctl
diff --git a/debian/changelog b/debian/changelog
index 05905b9..842f1ea 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+vzctl (3.0.30-2pve2) unstable; urgency=low
+
+  * fix bug in preinstall script (do not backup empty dir)
+
+ -- Proxmox Support Team <support@proxmox.com>  Tue, 06 Mar 2012 07:41:40 +0100
+
 vzctl (3.0.30-2pve1) unstable; urgency=low
 
   * update to vzctl 3.0.30.2
diff --git a/debian/vzctl.preinst b/debian/vzctl.preinst
index c24bf1a..823b8c3 100644
--- a/debian/vzctl.preinst
+++ b/debian/vzctl.preinst
@@ -26,6 +26,7 @@ case "$1" in
 	# move old config out of the way - newer version
 	# use a symlink to /etc/pve/openvz
 	if [ ! -L "/etc/vz/conf" ]; then
+	    rmdir "/etc/vz/conf" || true # try to remove empty dir
 	    if [ -e "/etc/vz/conf" ]; then 
 		if [ -e "/etc/vz/conf.org" ]; then
 		    echo "unable to backup existing configuration"