merge to HEAD as of 2006-08-21

diff --git a/vserver-reference.init b/vserver-reference.init
index 4ab7830..8bca238 100755 (executable)
--- a/vserver-reference.init
+++ b/vserver-reference.init
@@ -9,7 +9,7 @@
 # Mark Huang <mlhuang@cs.princeton.edu>
 # Copyright (C) 2004 The Trustees of Princeton University
 #
-# $Id$
+# $Id: vserver-reference.init,v 1.24 2006/08/10 18:49:16 mlhuang Exp $
 #
 
 case "$1" in
@@ -68,6 +68,9 @@ for file in /etc/hosts /etc/resolv.conf /etc/yum.conf /etc/planetlab/node_id \
     fi
 done
 
+# Remove stale RPM locks
+rm -f $vroot/var/lib/rpm/__db*
+
 # (Re)install GPG signing keys
 if [ -d /etc/pki/rpm-gpg ] ; then
     for vroot in $VROOTS ; do