%define name vserver-reference
-%define version 3.0
-%define release 2.planetlab%{?date:.%{date}}
+%define version 3.1
+%define release 1.planetlab%{?date:.%{date}}
Vendor: PlanetLab
Packager: PlanetLab Central <support@planet-lab.org>
Distribution: PlanetLab 3.0
-URL: http://www.planet-lab.org
+URL: http://cvs.planet-lab.org/cvs/vserver-reference
Summary: VServer reference image
Name: %{name}
License: GPL
Group: Applications/System
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
-BuildArchitectures: noarch
Requires: util-vserver, e2fsprogs, yum
+AutoReqProv: no
+%define debug_package %{nil}
+
%description
This package creates the virtual server (VServer) reference image used
as the installation base for new PlanetLab slivers.
%setup -q
%build
+RPM_BUILD_DIR=$RPM_BUILD_DIR ./%{name}.init
%install
rm -rf $RPM_BUILD_ROOT
+find vservers/vserver-reference | cpio -p -d -u $RPM_BUILD_ROOT/
+
+# If run under sudo, allow user to delete the build directory
+if [ -n "$SUDO_USER" ] ; then
+ chown -R $SUDO_USER .
+fi
%clean
rm -rf $RPM_BUILD_ROOT
-%post
-. /usr/lib/util-vserver/util-vserver-vars
-
-# Make /vservers
-mkdir -p $VROOTDIR
-chmod 000 $VROOTDIR
-chattr +t $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
-chattr -t $VROOT
-chmod 755 $VROOT
-
-# Clean up before exiting if anything goes wrong
-set -e
-trap "umount $VROOT/proc ; umount $VROOT/dev/pts ; chattr -R -i $VROOT ; rm -rf $VROOT" EXIT
-
-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
-
-# Zap some locks
-TMP=`mktemp -d /tmp/%{name}.XXXXXX`
-if [ -f /var/lock/rpm/transaction ] ; then
- mv /var/lock/rpm/transaction $TMP
-fi
-if [ -f /var/run/yum.pid ] ; then
- mv /var/run/yum.pid $TMP
+# If run under sudo, allow user to delete the built RPM
+if [ -n "$SUDO_USER" ] ; then
+ chown $SUDO_USER %{_rpmdir}/%{_arch}/%{name}-%{version}-%{release}.%{_arch}.rpm
fi
-# Initialize RPM database in reference image
-mkdir -p $VROOT/var/lib/rpm
-rpm --root $VROOT --initdb
+%files
+%defattr(-,root,root)
+/vservers/vserver-reference
+
+%define vcached_pid /var/run/vcached.pid
-# Install RPMs in reference image
-yum \
---sslcertdir=/mnt/cdrom/bootme/cacert \
---installroot=$VROOT \
--y groupinstall VServer
+%pre
+# Stop vcached
+if [ -r %{vcached_pid} ] ; then
+ kill $(cat %{vcached_pid})
+fi
+touch %{vcached_pid}
-# Restore locks
-if [ -f $TMP/transaction ] ; then
- mv $TMP/transaction /var/lock/rpm
+# vcached will clean up .vtmp later
+mkdir -p /vservers/.vtmp
+if [ -d /vservers/vserver-reference ] ; then
+ mv /vservers/vserver-reference /vservers/.vtmp/vserver-reference.$RANDOM
fi
-if [ -f $TMP/yum.pid ] ; then
- mv $TMP/yum.pid /var/run
+if [ -d /vservers/.vcache ] ; then
+ mv /vservers/.vcache /vservers/.vtmp/.vcache.$RANDOM
fi
-rmdir $TMP
-# Clean up /dev in reference image
-umount $VROOT/dev/pts
-MAKEDEV
+%post
+VROOT=/vservers/vserver-reference
-# 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
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
-%postun
-. /usr/lib/util-vserver/util-vserver-vars
+# Install boot server certificate
+install -D -m 644 $MA_BOOT_SERVER_CACERT $VROOT/$MA_BOOT_SERVER_CACERT
-mkdir -p $VROOTDIR/.vtmp
-TMP=$(mktemp -d $VROOTDIR/.vtmp/vserver-reference.XXXXXX)
-if [ -d $VROOTDIR/vserver-reference ] ; then
- mv $VROOTDIR/vserver-reference $TMP
- # Let vcached clean it up later
-fi
+# 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
-%files
-%defattr(-,root,root)
+# Allow vcached to run again
+rm -f %{vcached_pid}
%changelog
+* Tue Sep 1 2005 Mark Huang <mlhuang@cs.princeton.edu> 3.1-1.planetlab
+- Pre-package vserver-reference instead of building it on nodes
+
+* Tue Nov 30 2004 Mark Huang <mlhuang@cs.princeton.edu> 3.0-5.planetlab
+- PL3118 and PL3131 fix: set barrier bit on /vservers instead of old
+ immulink bit. Do not reset the immutable bit on the new
+ vserver-reference directory when deleting it after an error.
+
+* Mon Nov 15 2004 Mark Huang <mlhuang@cs.princeton.edu> 3.0-4.planetlab
+- bump release to install Fedora Core 2 updates as of Tue Nov 9 2004
+- PL3017 fix: rebuild vserver-reference image in case it was built
+ with i386 glibc
+
+* Mon Nov 15 2004 Mark Huang <mlhuang@cs.princeton.edu> 3.0-4.planetlab
+- bump release to install Fedora Core 2 updates as of Tue Nov 9 2004
+- PL3017 fix: rebuild vserver-reference image in case it was built
+ with i386 glibc
+
+* Sun Oct 10 2004 Mark Huang <mlhuang@cs.princeton.edu> 3.0-3.planetlab
+- dynamically install reference image at init time
+
* Sun Oct 10 2004 Mark Huang <mlhuang@cs.princeton.edu> 3.0-2.planetlab
- dynamically install reference image
git://git.onelab.eu / sliceimage.git / blobdiff