X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=vserver-reference.init;h=62870542323ae23e845281cf3b049bb62e501c58;hb=refs%2Fheads%2Fplanetlab-3_3-branch;hp=c8170e4a917095219a487ffc32c033323c6a872f;hpb=1accc5f143b60a13472f5cb540e1d33c67e000b8;p=sliceimage.git

diff --git a/vserver-reference.init b/vserver-reference.init
index c8170e4..6287054 100755
--- a/vserver-reference.init
+++ b/vserver-reference.init
@@ -1,6 +1,6 @@
 #!/bin/bash
 #
-# vserver-reference	Builds VServer reference
+# vserver-reference	Updates VServer reference
 #
 # Load before pl_conf, pl_nm, vcached, and vservers
 # chkconfig: 3 60 80
@@ -9,7 +9,7 @@
 # Mark Huang <mlhuang@cs.princeton.edu>
 # Copyright (C) 2004 The Trustees of Princeton University
 #
-# $Id: vserver-reference.init,v 1.6 2004/11/17 22:54:19 mlhuang Exp $
+# $Id: vserver-reference.init,v 1.19.4.2 2006/05/08 20:53:35 mlhuang Exp $
 #
 
 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
@@ -38,105 +47,57 @@ exec 4>&2
 exec 2>&1
 exec &>/var/log/vserver-reference.log
 
-# Make /vservers
-mkdir -p $VROOTDIR
-chmod 000 $VROOTDIR
-$PKGLIBDIR/setattr --barrier $VROOTDIR
-
-# Build image in /vservers/.vtmp
-mkdir -p $VROOTDIR/.vtmp
-VROOT=$(mktemp -d $VROOTDIR/.vtmp/vserver-reference.XXXXXX)
-
-# Make /vservers/.vtmp/vserver-reference.XXXXXX
-mkdir -p $VROOT
-chmod 755 $VROOT
-
-echo -n $"Building VServer reference: " >&3 2>&4
-
-# Clean up before exiting if anything goes wrong
-trap "umount $VROOT/proc ; umount $VROOT/dev/pts ; rm -rf $VROOT ; failure >&3 2>&4 ; echo >&3 2>&4 ; exit 255" ERR
-
-MAKEDEV ()
-{
-    rm -rf $VROOT/dev
-    mkdir -p $VROOT/dev
-    mknod -m 666 $VROOT/dev/null c 1 3
-    mknod -m 666 $VROOT/dev/zero c 1 5
-    mknod -m 666 $VROOT/dev/full c 1 7
-    mknod -m 644 $VROOT/dev/random c 1 8
-    mknod -m 644 $VROOT/dev/urandom c 1 9
-    mknod -m 666 $VROOT/dev/tty c 5 0
-    mknod -m 666 $VROOT/dev/ptmx c 5 2
-    touch $VROOT/dev/hdv1
-}
-
-# Initialize /dev in reference image
-MAKEDEV
-
-# Mount /dev/pts in reference image
-mkdir -p $VROOT/dev/pts
-mount -t devpts none $VROOT/dev/pts
+echo -n $"Updating VServer reference: " >&3 2>&4
 
-# Mount /proc in reference image
-mkdir -p $VROOT/proc
-mount -t proc none $VROOT/proc
+shopt -s nullglob
 
-# Create a dummy /etc/fstab in reference image
-mkdir -p $VROOT/etc
-cat > $VROOT/etc/fstab <<EOF
-# This fake fstab exists only to please df and linuxconf.
-/dev/hdv1	/	ext2	defaults	1 1
-EOF
-cp $VROOT/etc/fstab $VROOT/etc/mtab
+VROOTS="$__DEFAULT_VSERVERDIR/vserver-reference $__DEFAULT_VSERVERDIR/.vcache/* $__DEFAULT_VSERVERDIR/${PLC_SLICE_PREFIX}_*"
 
-# Prevent all locales from being installed in reference image
-mkdir -p $VROOT/etc/rpm
-cat > $VROOT/etc/rpm/macros <<EOF
-%_install_langs en_US:en
-%_excludedocs 1
-%__file_context_path /dev/null
-EOF
+# Make sure the barrier bit is set
+chmod 0000 /vservers
+setattr --barrier /vservers
 
-# Initialize RPM database in reference image
-mkdir -p $VROOT/var/lib/rpm
-rpm --root $VROOT --initdb
-
-# Update certificates
-if [ -d /mnt/cdrom/bootme/cacert ] ; then
-    SSLCERTDIR="--sslcertdir /mnt/cdrom/bootme/cacert"
-    find /mnt/cdrom/bootme/cacert | cpio -p -d $VROOT
-fi
-
-# Install RPMs in reference image
-yum $SSLCERTDIR --installroot=$VROOT -y groupinstall VServer
-
-# Clean up /dev in reference image
-umount $VROOT/dev/pts
-MAKEDEV
-
-# Disable all services in reference image
-chroot $VROOT /bin/sh -c "chkconfig --list | awk '{ print \$1 }' | xargs -i chkconfig {} off"
-
-# Copy configuration files from host to reference image
-for file in /etc/hosts /etc/resolv.conf /etc/yum.conf ; do
-    if [ -f $file ] ; then
-	echo $file | cpio -p -d -u $VROOT
+# 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
+	for vroot in $VROOTS ; do
+	    install -D -m 644 $file $vroot/$file
+	done
     fi
 done
 
-# Clean up
-umount $VROOT/proc
-
-# Swap them when complete
-mv $VROOT $VROOTDIR
-if [ -d $VROOTDIR/vserver-reference ] ; then
-    mv $VROOTDIR/vserver-reference $VROOT
-    # Let vcached clean it up later
+# (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
-mv $VROOTDIR/$(basename $VROOT) $VROOTDIR/vserver-reference
 
-# Disable again
-chkconfig vserver-reference off
+# 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 $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