From 9c40ff4169293ebf1715cd660a9315a432f85371 Mon Sep 17 00:00:00 2001
From: Stephen Soltesz <soltesz@cs.princeton.edu>
Date: Mon, 3 Aug 2009 16:00:31 +0000
Subject: [PATCH] the code looks like it was incomplete, since it referenced a
 local value rather than iterating across all of them.  This fix applies the
 'rm' to all VROOT dirs, and prevents 'rpm --allmatches' from hanging on boot
 up.

---
 vserver-reference.init | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/vserver-reference.init b/vserver-reference.init
index fd00823..410e807 100755
--- a/vserver-reference.init
+++ b/vserver-reference.init
@@ -142,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
-- 
2.43.0