X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=vserver-reference.init;h=8f41e35052af126b4dff35c490d037866a6cf669;hb=5b523d1ac828416c24a7d62ae00d92f6c5d4e9ed;hp=f099cb0b23077e2fd65b6c014364566aef79fef2;hpb=4b4c76464a1bfaba046083a7a2c9b22d6d74fa5b;p=vserver-reference.git

diff --git a/vserver-reference.init b/vserver-reference.init
index f099cb0..8f41e35 100755
--- 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: vserver-reference.init,v 1.17 2005/09/02 19:46:37 mlhuang Exp $
+# $Id$
 #
 
 case "$1" in
@@ -30,6 +30,15 @@ esac
 # VServer definitions
 . /usr/lib/util-vserver/util-vserver-vars
 
+# Parse PLC configuration
+if [ -r /etc/planetlab/plc_config ] ; then
+    . /etc/planetlab/plc_config
+else
+    PLC_NAME="PlanetLab"
+    PLC_SLICE_PREFIX="pl"
+    PLC_BOOT_HOST="boot.planet-lab.org"
+fi
+
 # Save stdout and stderr
 exec 3>&1
 exec 4>&2
@@ -40,43 +49,58 @@ exec &>/var/log/vserver-reference.log
 
 echo -n $"Updating VServer reference: " >&3 2>&4
 
-VROOT=$__DEFAULT_VSERVERDIR/vserver-reference
+shopt -s nullglob
+
+VROOTS="$__DEFAULT_VSERVERDIR/vserver-reference $__DEFAULT_VSERVERDIR/.vcache/* $__DEFAULT_VSERVERDIR/${PLC_SLICE_PREFIX}_*"
 
 # Make sure the barrier bit is set
 chmod 0000 /vservers
 setattr --barrier /vservers
 
-# Copy configuration files from host to reference image
-for file in /etc/hosts /etc/resolv.conf /etc/yum.conf ; do
+# Copy configuration files from host to slices
+for file in /etc/hosts /etc/resolv.conf /etc/yum.conf /etc/planetlab/node_id \
+            /etc/planetlab/plc_config* /etc/planetlab/php/* \
+            /etc/pki/rpm-gpg/* ; do
     if [ -r $file ] ; then
-	echo $file | cpio -p -d -u $VROOT 2>/dev/null
+	for vroot in $VROOTS ; do
+	    install -D -m 644 $file $vroot/$file
+	done
     fi
 done
 
-# Install and parse Management Authority (MA) configuration
-if [ -r /etc/planetlab/primary_ma ] ; then
-    . /etc/planetlab/primary_ma
-    install -D -m 644 /etc/planetlab/primary_ma $VROOT/etc/planetlab/primary_ma
-elif [ -d /mnt/cdrom/bootme/cacert ] ; then
-    MA_NAME="PlanetLab Central"
-    MA_BOOT_SERVER=$(head -1 /mnt/cdrom/bootme/BOOTSERVER)
-    MA_BOOT_SERVER_CACERT=/mnt/cdrom/bootme/cacert/$MA_BOOT_SERVER/cacert.pem
-    mkdir -p $VROOT/etc/planetlab
-    cat > $VROOT/etc/planetlab/primary_ma <<EOF
-MA_NAME="$MA_NAME"
-MA_BOOT_SERVER="$MA_BOOT_SERVER"
-MA_BOOT_SERVER_CACERT="$MA_BOOT_SERVER_CACERT"
-EOF
+# 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
+	chroot $vroot rpm --allmatches -e gpg-pubkey || :
+	chroot $vroot rpm --import /etc/pki/rpm-gpg/* || :
+    done
 fi
 
-if [ -r "$MA_BOOT_SERVER_CACERT" ] ; then
-    # Install boot server certificate
-    install -D -m 644 $MA_BOOT_SERVER_CACERT $VROOT/$MA_BOOT_SERVER_CACERT
+# Old versions of the Boot Manager copied portions of the Boot CD to
+# /mnt/cdrom/bootme, to support old scripts which assumed that the
+# Boot CD was mounted even in production mode. Now, it just copies it
+# to /usr/boot/cacert.pem. In any case, copy the boot server
+# certificate to the place(s) where BootServerRequest expects to find
+# it (/usr/boot/cacert.pem by default, /mnt/cdrom/bootme in old
+# versions).
+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 $MA_BOOT_SERVER_CACERT $VROOT/mnt/cdrom/bootme/cacert/$MA_BOOT_SERVER/cacert.pem
-    echo $MA_BOOT_SERVER > $VROOT/mnt/cdrom/bootme/BOOTSERVER
-fi
+	    # 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
+	done
+	break
+    fi
+done
 
 success >&3 2>&4
 echo >&3 2>&4