X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=vserver-reference.init;h=2c81057ed599abb848f7410e88303a9b7ebe9b15;hb=b0014ac63a0b8dc606d2ca38fab8ad4058294942;hp=ec48b45fff572a54425a7c245ca3b47a6ccd1339;hpb=4be3f2f1b2870a03c8f09cb261107ad1be7537c1;p=vserver-reference.git

diff --git a/vserver-reference.init b/vserver-reference.init
index ec48b45..2c81057 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.1 2004/10/14 18:25:05 mlhuang Exp $
+# $Id$
 #
 
 case "$1" in
@@ -30,112 +30,54 @@ esac
 # VServer definitions
 . /usr/lib/util-vserver/util-vserver-vars
 
-# Make /vservers
-mkdir -p $VROOTDIR
-chmod 000 $VROOTDIR
-chattr +t $VROOTDIR
+# Save stdout and stderr
+exec 3>&1
+exec 4>&2
 
-# Build image in /vservers/.vtmp
-mkdir -p $VROOTDIR/.vtmp
-VROOT=$(mktemp -d $VROOTDIR/.vtmp/vserver-reference.XXXXXX)
+# Redirect stdout and stderr to a log file
+exec 2>&1
+exec &>/var/log/vserver-reference.log
 
-# Make /vservers/.vtmp/vserver-reference.XXXXXX
-mkdir -p $VROOT
-chattr -t $VROOT
-chmod 755 $VROOT
+echo -n $"Updating VServer reference: " >&3 2>&4
 
-# Clean up before exiting if anything goes wrong
-set -e
-echo -n $"Building VServer reference: "
-trap "umount $VROOT/proc ; umount $VROOT/dev/pts ; chattr -R -i $VROOT ; rm -rf $VROOT ; failure ; echo ; exit 255" EXIT
+VROOT=$__DEFAULT_VSERVERDIR/vserver-reference
 
-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
-
-# Mount /proc in reference image
-mkdir -p $VROOT/proc
-mount -t proc none $VROOT/proc
-
-# 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
-
-# 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
-
-# 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 >/dev/null 2>&1
-fi
-
-# Install RPMs in reference image
-yum $SSLCERTDIR --installroot=$VROOT -e 0 -d 0 -y groupinstall VServer >/dev/null 2>&1
-
-# 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"
+# 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
-    if [ -f $file ] ; then
-	echo $file | cpio -p -d -u $VROOT >/dev/null 2>&1
+for file in /etc/hosts /etc/resolv.conf /etc/yum.conf /etc/planetlab/node_id ; do
+    if [ -r $file ] ; then
+	echo $file | cpio -p -d -u $VROOT 2>/dev/null
     fi
 done
 
-# Clean up
-umount $VROOT/proc
-
-# Reset trap
-trap - EXIT
-
-# Swap them when complete
-mv $VROOT $VROOTDIR
-if [ -d $VROOTDIR/vserver-reference ] ; then
-    mv $VROOTDIR/vserver-reference $VROOT
-    # Let vcached clean it up later
+# 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
-mv $VROOTDIR/$(basename $VROOT) $VROOTDIR/vserver-reference
 
-# Disable again
-chkconfig vserver-reference off
+if [ -r "$MA_BOOT_SERVER_CACERT" ] ; then
+    # Install boot server certificate
+    install -D -m 644 $MA_BOOT_SERVER_CACERT $VROOT/$MA_BOOT_SERVER_CACERT
 
-# Reset trap
-trap - EXIT
+    # 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
 
-success
-echo
+success >&3 2>&4
+echo >&3 2>&4
 exit 0