X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=vserver-reference.spec;h=1616904e16da6df694d0d4931de297b10b6c302b;hb=e01407b25d5e55e4ff342bcd95998fc5f1263e62;hp=decb529170bd83feb8b4d4279b6e93116acc0483;hpb=56d33e381ce1e3ca55de06f1f1637db39e296503;p=sliceimage.git diff --git a/vserver-reference.spec b/vserver-reference.spec index decb529..1616904 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 name vserver +%define version 4.0 +%define release 2%{?pldistro:.%{pldistro}}%{?date:.%{date}} Vendor: PlanetLab Packager: PlanetLab Central 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} @@ -15,112 +15,128 @@ Source0: %{name}-%{version}.tar.bz2 License: GPL Group: Applications/System BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot -BuildArchitectures: noarch Requires: util-vserver, e2fsprogs, yum +Requires(pre): coreutils + +%define debug_package %{nil} %description +This package does not really exist. + +%package reference +Summary: VServer reference image +Group: Applications/System +AutoReqProv: no + +%description reference This package creates the virtual server (VServer) reference image used as the installation base for new PlanetLab slivers. +%package system-packages +Summary: System slice packages +Group: Applications/System +Requires: vserver-reference = %{version}-%{release} +AutoReqProv: no + +%description system-packages +This package installs the RPMS necessary to create system ("root + resource") slices from the virtual server (VServer) reference image. + %prep %setup -q %build +pushd vserver-reference +./build.sh +./system-packages.sh +popd %install rm -rf $RPM_BUILD_ROOT +pushd vserver-reference +install -D -m 755 vserver-reference.init $RPM_BUILD_ROOT/%{_initrddir}/vserver-reference +install -D -m 644 vserver-reference.cron $RPM_BUILD_ROOT/%{_sysconfdir}/cron.d/vserver-reference +find vservers | cpio -p -d -u $RPM_BUILD_ROOT/ +popd + %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 +# If run under sudo +if [ -n "$SUDO_USER" ] ; then + # Allow user to delete the build directory + chown -R $SUDO_USER . + # Some temporary cdroot files like /var/empty/sshd and + # /usr/bin/sudo get created with non-readable permissions. + find . -not -perm +0600 -exec chmod u+rw {} \; + # Allow user to delete the built RPM(s) + chown -R $SUDO_USER %{_rpmdir}/%{_arch} fi -$PKGLIBDIR/install-pre.sh vserver-reference +%files reference +%defattr(-,root,root) +%{_initrddir}/vserver-reference +%{_sysconfdir}/cron.d/vserver-reference +/vservers/vserver-reference -# Mount /dev/pts in reference image -mkdir -p $VROOT/dev/pts -mount -t devpts none $VROOT/dev/pts +%files system-packages +%defattr(-,root,root) +/vservers/system-packages -# Mount /proc in reference image -mkdir -p $VROOT/proc -mount -t proc none $VROOT/proc +%define vcached_pid /var/run/vcached.pid -# Prevent all locales from being installed in reference image -mkdir -p $VROOT/etc/rpm -cat > $VROOT/etc/rpm/macros < %{vcached_pid} -# Zap some locks -TMP=`mktemp -d /tmp/%{name}.XXXXXX` -if [ -f /var/lock/rpm/transaction ] ; then - mv /var/lock/rpm/transaction $TMP +# 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 /var/run/yum.pid ] ; then - mv /var/run/yum.pid $TMP +if [ -d /vservers/.vcache ] ; then + mv /vservers/.vcache /vservers/.vtmp/.vcache.$RANDOM fi -# Initialize RPM database in reference image -mkdir -p $VROOT/var/lib/rpm -rpm --root $VROOT --initdb +# Allow vcached to run again +rm -f %{vcached_pid} -# Install RPMs in reference image -yum \ ---sslcertdir=/mnt/cdrom/bootme/cacert \ ---installroot=$VROOT \ --y groupinstall VServer +%post reference +chkconfig --add vserver-reference +chkconfig vserver-reference on +[ "$PL_BOOTCD" = "1" ] || service vserver-reference start -# 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 +# Randomize daily run time +M=$((60 * $RANDOM / 32768)) +H=$((24 * $RANDOM / 32768)) +sed -i -e "s/@M@/$M/" -e "s/@H@/$H/" %{_sysconfdir}/cron.d/vserver-reference -# 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 +%changelog +* Tue Sep 1 2005 Mark Huang 3.1-1.planetlab +- Pre-package vserver-reference instead of building it on nodes -$PKGLIBDIR/install-post.sh vserver-reference +* Tue Nov 30 2004 Mark Huang 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. -# Disable all services in reference image -chroot $VROOT /bin/sh -c "chkconfig --list | awk '{ print \$1 }' | xargs -i chkconfig {} off" +* Mon Nov 15 2004 Mark Huang 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 -# Restart vcached -service vcached start +* Mon Nov 15 2004 Mark Huang 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 -%files -%defattr(-,root,root) +* Sun Oct 10 2004 Mark Huang 3.0-3.planetlab +- dynamically install reference image at init time -%changelog * Sun Oct 10 2004 Mark Huang 3.0-2.planetlab - dynamically install reference image