do not backup empty dir

diff --git a/Makefile b/Makefile
index 5332fcebba415cf7cfbd88d06805c881ffb51a86..81d95e8b78ddab99e0571e2c5b4fb8c4a00e8598 100644 (file)
--- 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 05905b97432a7f64eab458c5d67e14c0159bedab..842f1ea76d65152c131519bdcea4394d9a509238 100644 (file)
--- 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 c24bf1a48f9bb184de8744f60d3671b12988e646..823b8c3845cf5cb1d8f5ad7dfe1e71ba1d3c4823 100644 (file)
--- 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"