From e6972eec3490fe74d886bd2899ff24b5392365d1 Mon Sep 17 00:00:00 2001
From: Marc Fiuczynski <mef@cs.princeton.edu>
Date: Thu, 25 Feb 2010 14:45:35 +0000
Subject: [PATCH] be more careful about slices that might not exist after a
 hung vserver reference pass

---
 initscripts/vserver-reference | 26 +++++++++++++++-----------
 1 file changed, 15 insertions(+), 11 deletions(-)

diff --git a/initscripts/vserver-reference b/initscripts/vserver-reference
index 410e807..ab1c42f 100755
--- a/initscripts/vserver-reference
+++ b/initscripts/vserver-reference
@@ -137,7 +137,7 @@ for file in /etc/hosts /etc/resolv.conf /etc/planetlab/node_id \
             /etc/pki/rpm-gpg/* ; do
     if [ -r $file ] ; then
 	for vroot in $VROOTS ; do
-	    install -D -m 644 $file $vroot/$file
+	    [ -d $vroot ] && install -D -m 644 $file $vroot/$file
 	done
     fi
 done
@@ -146,14 +146,16 @@ done
 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*
+    [ -d $vroot ] && rm -f $vroot/var/lib/rpm/__db*
 done
 
 # (Re)install GPG signing keys
 if [ -d /etc/pki/rpm-gpg ] ; then
     for vroot in $VROOTS ; do
-	chroot $vroot rpm --allmatches -e gpg-pubkey || :
-	chroot $vroot rpm --import /etc/pki/rpm-gpg/* || :
+	if [ -d $vroot ] ; then
+	    chroot $vroot rpm --allmatches -e gpg-pubkey || :
+	    chroot $vroot rpm --import /etc/pki/rpm-gpg/* || :
+	fi
     done
 fi
 
@@ -168,13 +170,15 @@ CACERT="/usr/boot/cacert.pem /mnt/cdrom/bootme/cacert/$PLC_BOOT_HOST/cacert.pem"
 for cacert in $CACERT ; do
     if [ -r $cacert ] ; then
 	for vroot in $VROOTS ; do
-	    # Install boot server certificate
-	    install -D -m 644 $cacert $vroot/usr/boot/cacert.pem
-	    echo $PLC_BOOT_HOST > $vroot/usr/boot/boot_server
-
-	    # Also install in /mnt/cdrom/bootme for backward compatibility
-	    install -D -m 644 $cacert $vroot/mnt/cdrom/bootme/cacert/$PLC_BOOT_HOST/cacert.pem
-	    echo $PLC_BOOT_HOST > $vroot/mnt/cdrom/bootme/BOOTSERVER
+	    if [ -d $vroot ] ; then
+		# Install boot server certificate
+		install -D -m 644 $cacert $vroot/usr/boot/cacert.pem
+		echo $PLC_BOOT_HOST > $vroot/usr/boot/boot_server
+
+		# Also install in /mnt/cdrom/bootme for backward compatibility
+		install -D -m 644 $cacert $vroot/mnt/cdrom/bootme/cacert/$PLC_BOOT_HOST/cacert.pem
+		echo $PLC_BOOT_HOST > $vroot/mnt/cdrom/bootme/BOOTSERVER
+	    fi
 	done
 	break
     fi
-- 
2.43.0