- merge revision 1.21

- treat system slices (pl_*) as reference images in that their
  configuration files should always be updated
- expect boot server certificate to be in /usr/boot/ (Boot
  Manager will put it here soon); copy boot server certificate to
  /usr/boot/ in the reference image
- merge revision 1.20
- also update cached reference images
- install /etc/planetlab/plc_config* files if present

diff --git a/vserver-reference.init b/vserver-reference.init
index 2c81057..21242ab 100755 (executable)
--- a/vserver-reference.init
+++ b/vserver-reference.init
@@ -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,56 @@ 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 /etc/planetlab/node_id ; 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/RPM-GPG-KEY-planetlab ; do
     if [ -r $file ] ; then
-       echo $file | cpio -p -d -u $VROOT 2>/dev/null
+       for vroot in $VROOTS ; do
+           if [ "$file" = "/etc/pki/rpm-gpg/RPM-GPG-KEY-planetlab" -a \
+                ! -f $vroot/$file ] ; then
+               import=1
+           else
+               import=0
+           fi
+           install -D -m 644 $file $vroot/$file
+           if [ $import -eq 1 ] ; then
+               chroot $vroot rpm --import $file
+           fi
+       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
-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