X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=vserver-reference.init;h=410e807018a6581fb52265fd39de2d15625c97b2;hb=b047c1ff7a02bca913095ec408dce663b810d9c2;hp=c5ac0a65cff1525c0ecfe82caf511fdb365ec39e;hpb=887a37a54311faec2b38a8f67dd2b89309d4b8ae;p=vserver-reference.git

diff --git a/vserver-reference.init b/vserver-reference.init
index c5ac0a6..410e807 100755
--- a/vserver-reference.init
+++ b/vserver-reference.init
@@ -28,7 +28,11 @@ esac
 . /etc/init.d/functions
 
 # VServer definitions
-. /usr/lib/util-vserver/util-vserver-vars
+init_paths="/usr/lib64/util-vserver/util-vserver-vars /usr/lib/util-vserver/util-vserver-vars"
+for init_path in $init_paths ; do
+    [ -f $init_path ] && { source $init_path ; break; }
+done
+[ "$PACKAGE_NAME" = "util-vserver" ] || echo "WARNING: could not find util-vserver init file among $init_paths"
 
 # Save stdout and stderr
 exec 3>&1
@@ -138,8 +142,12 @@ for file in /etc/hosts /etc/resolv.conf /etc/planetlab/node_id \
     fi
 done
 
-# Remove stale RPM locks
-rm -f $vroot/var/lib/rpm/__db*
+
+for vroot in $VROOTS ; do
+    # NOTE: without this step, the 'rpm --allmatches' step can hang on boot
+    # Remove stale RPM locks from all VROOT dirs
+    rm -f $vroot/var/lib/rpm/__db*
+done
 
 # (Re)install GPG signing keys
 if [ -d /etc/pki/rpm-gpg ] ; then