X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=vserver-reference.spec;h=86b188a3787aa3e435f45ae1c6ad14007c2972bd;hb=bcd489967e8f3670fb1e0d13bbedd95643c340ea;hp=10455011c5b45532965771bbf0166881c425eb12;hpb=5df962adcf05f12a802f828e8da91eebfe2b2874;p=sliceimage.git

diff --git a/vserver-reference.spec b/vserver-reference.spec
index 1045501..86b188a 100644
--- a/vserver-reference.spec
+++ b/vserver-reference.spec
@@ -1,6 +1,6 @@
 %define name vserver-reference
 %define version 3.0
-%define release 1.planetlab%{?date:.%{date}}
+%define release 2.planetlab%{?date:.%{date}}
 
 Vendor: PlanetLab
 Packager: PlanetLab Central <support@planet-lab.org>
@@ -16,173 +16,156 @@ License: GPL
 Group: Applications/System
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
 BuildArchitectures: noarch
-Requires: util-vserver
-AutoReqProv: no
-BuildRequires: e2fsprogs, yum
-
-%define debug_package %{nil}
+Requires: util-vserver, e2fsprogs, yum
 
 %description
 This package creates the virtual server (VServer) reference image used
 as the installation base for new PlanetLab slivers.
 
-%define vrootdir /vservers
-%define vrefdir %{vrootdir}/%{name}
-%define installroot $RPM_BUILD_ROOT%{vrefdir}
-
 %prep
 %setup -q
 
-# chattr, mknod, mount, yum all require root privileges. Yech.
-if [ $UID -ne 0 ] ; then
-    echo You must be root to build the %{name} package.
-    false
-fi
-
 %build
 
 %install
-# Running as root
-export PATH="$PATH:/sbin:/usr/sbin"
+rm -rf $RPM_BUILD_ROOT
 
-# Clean up
-if grep -q %{installroot}/proc /proc/mounts ; then
-    umount %{installroot}/proc
-fi
-if grep -q %{installroot}/dev/pts /proc/mounts ; then
-    umount %{installroot}/dev/pts
-fi
-chattr -R -i $RPM_BUILD_ROOT
+%clean
 rm -rf $RPM_BUILD_ROOT
 
+%post
+. /usr/lib/util-vserver/util-vserver-vars
+
 # Make /vservers
-mkdir -p $RPM_BUILD_ROOT%{vrootdir}
-chmod 000 $RPM_BUILD_ROOT%{vrootdir}
-chattr +t $RPM_BUILD_ROOT%{vrootdir}
+mkdir -p $VROOTDIR
+chmod 000 $VROOTDIR
+chattr +t $VROOTDIR
 
-# Make /vservers/vserver-reference
-mkdir -p %{installroot}
-chattr -t %{installroot}
-chmod 755 %{installroot}
+# 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 ()
 {
-    if grep -q %{installroot}/dev/pts /proc/mounts ; then
-	umount %{installroot}/dev/pts
-    fi
-    rm -rf %{installroot}/dev
-    mkdir -p %{installroot}/dev
-    mknod -m 666 %{installroot}/dev/null c 1 3
-    mknod -m 666 %{installroot}/dev/zero c 1 5
-    mknod -m 666 %{installroot}/dev/full c 1 7
-    mknod -m 644 %{installroot}/dev/random c 1 8
-    mknod -m 644 %{installroot}/dev/urandom c 1 9
-    mknod -m 666 %{installroot}/dev/tty c 5 0
-    mknod -m 666 %{installroot}/dev/ptmx c 5 2
-    touch %{installroot}/dev/hdv1
+    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 %{installroot}/dev/pts
-mount -t devpts none %{installroot}/dev/pts
+mkdir -p $VROOT/dev/pts
+mount -t devpts none $VROOT/dev/pts
 
 # Mount /proc in reference image
-mkdir -p %{installroot}/proc
-mount -t proc none %{installroot}/proc
+mkdir -p $VROOT/proc
+mount -t proc none $VROOT/proc
 
 # Create a dummy /etc/fstab in reference image
-mkdir -p %{installroot}/etc
-cat > %{installroot}/etc/fstab <<EOF
+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 %{installroot}/etc/rpm
-cat > %{installroot}/etc/rpm/macros <<EOF
-%_install_langs en_US:en
-%_excludedocs 1
+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 %{installroot}/var/lib/rpm
-rpm --root %{installroot} --initdb
+# 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
+fi
 
-# XXX Get yum.conf from PlanetLabConf
+# Initialize RPM database in reference image
+mkdir -p $VROOT/var/lib/rpm
+rpm --root $VROOT --initdb
 
 # Install RPMs in reference image
-yum -c ./yum.conf \
-%{?sslcertdir:--sslcertdir=%{sslcertdir}} \
---installroot=%{installroot} \
+yum \
+--sslcertdir=/mnt/cdrom/bootme/cacert \
+--installroot=$VROOT \
 -y groupinstall VServer
 
-# Freshen any new RPMs
-find %{_topdir}/RPMS -type f | xargs rpm --root %{installroot} -F
+# Restore locks
+if [ -f $TMP/transaction ] ; then
+    mv $TMP/transaction /var/lock/rpm
+fi
+if [ -f $TMP/yum.pid ] ; then
+    mv $TMP/yum.pid /var/run
+fi
+rmdir $TMP
 
 # Clean up /dev in reference image
+umount $VROOT/dev/pts
 MAKEDEV
 
-# Configure authentication in reference image
-chroot %{installroot} authconfig --nostart --kickstart --enablemd5 --enableshadow || :
-
 # Disable all services in reference image
-chroot %{installroot} /bin/sh -c "chkconfig --list | awk '{ print \$1 }' | xargs -i chkconfig {} off"
+chroot $VROOT /bin/sh -c "chkconfig --list | awk '{ print \$1 }' | xargs -i chkconfig {} off"
 
-# Clean up
-if grep -q %{installroot}/proc /proc/mounts ; then
-    umount %{installroot}/proc
-fi
-if grep -q %{installroot}/dev/pts /proc/mounts ; then
-    umount %{installroot}/dev/pts
-fi
-
-%clean
-# Running as root
-export PATH="$PATH:/sbin:/usr/sbin"
-
-# Clean up
-if grep -q %{installroot}/proc /proc/mounts ; then
-    umount %{installroot}/proc
-fi
-if grep -q %{installroot}/dev/pts /proc/mounts ; then
-    umount %{installroot}/dev/pts
-fi
-chattr -R -i $RPM_BUILD_ROOT
-rm -rf $RPM_BUILD_ROOT
-
-# Make sure the original user can remove the generated files
-if [ -n "$SUDO_UID" ] ; then
-    chown -R $SUDO_UID.$SUDO_GID .
-    for i in \
-	%{_topdir}/BUILD \
-	%{_topdir}/RPMS/noarch/%{name}-%{version}-%{release}.noarch.rpm \
-	%{_topdir}/RPMS/noarch \
-	%{_topdir}/RPMS/ \
-	%{_topdir}/SRPMS/%{name}-%{version}-%{release}.src.rpm \
-	%{_topdir}/SRPMS/ ; do
-      if [ -e $i ] ; then
-	  chown $SUDO_UID.$SUDO_GID $i
-      fi
-    done
-fi
-
-%post
 # 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 %{vrefdir}
+	echo $file | cpio -p -d -u $VROOT
     fi
 done
 
-%preun
+# 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
+fi
+mv $VROOTDIR/$(basename $VROOT) $VROOTDIR/vserver-reference
+
+%postun
+. /usr/lib/util-vserver/util-vserver-vars
+
+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
 
 %files
 %defattr(-,root,root)
-%{vrefdir}
 
 %changelog
+* Sun Oct 10 2004 Mark Huang <mlhuang@cs.princeton.edu> 3.0-2.planetlab
+- dynamically install reference image
+
 * Tue Sep 14 2004 Mark Huang <mlhuang@cs.princeton.edu> 3.0-1.planetlab
 - initial build