X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=vserver-reference.spec;h=cc4a29b8eb7a8e84179571ec5bb1303538a37b42;hb=74ef863c43b7abe625c2f7f2ed9e0f52b121a757;hp=decb529170bd83feb8b4d4279b6e93116acc0483;hpb=56d33e381ce1e3ca55de06f1f1637db39e296503;p=vserver-reference.git

diff --git a/vserver-reference.spec b/vserver-reference.spec
index decb529..cc4a29b 100644
--- a/vserver-reference.spec
+++ b/vserver-reference.spec
@@ -1,11 +1,11 @@
 %define name vserver-reference
 %define version 3.0
-%define release 2.planetlab%{?date:.%{date}}
+%define release 4.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}
@@ -29,98 +29,28 @@ as the installation base for new PlanetLab slivers.
 
 %install
 rm -rf $RPM_BUILD_ROOT
+install -D -m 755 %{name}.init $RPM_BUILD_ROOT/%{_initrddir}/%{name}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post
-. /usr/lib/util-vserver/util-vserver-vars
-VROOT=$VROOTDIR/vserver-reference
-
-# Pause vcached
-service vcached stop
-
-# Remove old installation first
-if [ -d $VROOT ] ; then
-    if grep -q $VROOT/proc /proc/mounts ; then
-	umount $VROOT/proc
-    fi
-    if grep -q $VROOT/dev/pts /proc/mounts ; then
-	umount $VROOT/dev/pts
-    fi
-    chattr -R -i $VROOT
-    rm -rf $VROOT
-fi
-
-$PKGLIBDIR/install-pre.sh vserver-reference
-
-# 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
-
-# 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
-fi
-
-# Initialize RPM database in reference image
-mkdir -p $VROOT/var/lib/rpm
-rpm --root $VROOT --initdb
-
-# Install RPMs in reference image
-yum \
---sslcertdir=/mnt/cdrom/bootme/cacert \
---installroot=$VROOT \
--y groupinstall VServer
-
-# 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
-
-# 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
-    fi
-done
-
-# Clean up
-umount $VROOT/proc
-umount $VROOT/dev/pts
-
-$PKGLIBDIR/install-post.sh vserver-reference
-
-# Disable all services in reference image
-chroot $VROOT /bin/sh -c "chkconfig --list | awk '{ print \$1 }' | xargs -i chkconfig {} off"
-
-# Restart vcached
-service vcached start
-
 %files
 %defattr(-,root,root)
+%{_initrddir}/%{name}
+
+%post
+chkconfig --add %{name}
+chkconfig %{name} on
 
 %changelog
+* 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