X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=vserver-reference.spec;h=0ac7ff890560f93d9c0c059d90cf60c20e253486;hb=d73867e008eeae0d1f64f08c652a5bdb713f5163;hp=86b188a3787aa3e435f45ae1c6ad14007c2972bd;hpb=bcd489967e8f3670fb1e0d13bbedd95643c340ea;p=vserver-reference.git diff --git a/vserver-reference.spec b/vserver-reference.spec index 86b188a..0ac7ff8 100644 --- a/vserver-reference.spec +++ b/vserver-reference.spec @@ -1,13 +1,19 @@ -%define name vserver-reference -%define version 3.0 -%define release 2.planetlab%{?date:.%{date}} +# +# $Id$ +# +%define url $URL$ -Vendor: PlanetLab -Packager: PlanetLab Central -Distribution: PlanetLab 3.0 -URL: http://www.planet-lab.org +%define slicefamily %{pldistro}-%{distroname}-%{_arch} -Summary: VServer reference image +%define name vserver +%define version 4.2 +%define taglevel 18 + +# pldistro already in the rpm name +#%define release %{taglevel}%{?pldistro:.%{pldistro}}%{?date:.%{date}} +%define release %{taglevel}%{?date:.%{date}} + +Summary: VServer reference image for slice family %{slicefamily} Name: %{name} Version: %{version} Release: %{release} @@ -15,155 +21,179 @@ Source0: %{name}-%{version}.tar.bz2 License: GPL Group: Applications/System BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot -BuildArchitectures: noarch -Requires: util-vserver, e2fsprogs, yum +# this would not be right +#BuildArch: noarch + +Vendor: PlanetLab +Packager: PlanetLab Central +Distribution: PlanetLab %{plrelease} +URL: %(echo %{url} | cut -d ' ' -f 2) + +%define debug_package %{nil} %description +This package does not really exist. + +%package %{slicefamily} +Summary: VServer reference image +Group: Applications/System +AutoReqProv: no +Requires: util-vserver, e2fsprogs, yum + +%description %{slicefamily} This package creates the virtual server (VServer) reference image used as the installation base for new PlanetLab slivers. +%package systemslices-%{slicefamily} +Summary: System slice packages +Group: Applications/System +Requires: vserver-%{slicefamily} >= %{version}-%{release} +AutoReqProv: no + +%description systemslices-%{slicefamily} +This package installs the stubs necessary to create system slices +(typically planetflow) on top of the reference image. + %prep %setup -q %build +[ -d VserverReference ] || ln -s vserver-reference VserverReference +pushd VserverReference +./build.sh %{pldistro} %{slicefamily} +popd %install rm -rf $RPM_BUILD_ROOT +pushd VserverReference +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 +install -D -m 644 vserver-reference.logrotate $RPM_BUILD_ROOT/%{_sysconfdir}/logrotate.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 - -# 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 < $VROOT/etc/rpm/macros < /etc/planetlab/slicefamily ; } +[ "$PL_BOOTCD" = "1" ] || service vserver-reference start -# Disable all services in reference image -chroot $VROOT /bin/sh -c "chkconfig --list | awk '{ print \$1 }' | xargs -i chkconfig {} off" +# 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 +%changelog +* Thu Jan 13 2011 S.Çağlar Onur - vserver-reference-4.2-18 +- handle directory name change -# Clean up -umount $VROOT/proc +* Wed Jan 12 2011 Daniel Hokka Zakrisson - VserverReference-4.2-17 +- Remove ugly hack that breaks su/sudo on upgrades. -# Reset trap -trap - EXIT +* Tue Oct 20 2009 Thierry Parmentelat - VserverReference-4.2-16 +- fix issue about locating the post-install script(s) +- this was causing the onelab distro to miss the /etc/sudoers patch -# 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 +* Mon Oct 19 2009 Baris Metin - VserverReference-4.2-15 +- - comment out requiretty -%postun -. /usr/lib/util-vserver/util-vserver-vars +* Fri Oct 09 2009 Thierry Parmentelat - VserverReference-4.2-14 +- can use groups in the pkgs file with +++ for space -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 +* Mon Aug 10 2009 Stephen Soltesz - VserverReference-4.2-13 +- Added remove for all VROOTs rather than the last one. BUG FIX. -%files -%defattr(-,root,root) +* Tue Mar 24 2009 Thierry Parmentelat - VserverReference-4.2-12 +- fix for fedora 10 + +* Thu Oct 02 2008 Thierry Parmentelat - VserverReference-4.2-11 +- on 64bits archs, locates util-vserver's config file correctly + +* Thu Jul 03 2008 Daniel Hokka Zakrisson - VserverReference-4.2-10 +- Use the correct yum.conf to get access to required packages such as pf2slice. + +* Mon Jun 30 2008 Daniel Hokka Zakrisson - VserverReference-4.2-9 +- Scriptlet fix. + +* Fri Jun 27 2008 Daniel Hokka Zakrisson - VserverReference-4.2-8 +- Unset the immutable and iunlink bits to make sure we can install the package. + +* Fri Jun 27 2008 Daniel Hokka Zakrisson - VserverReference-4.2-7 +- Let rpm remove the files. + +* Thu Apr 24 2008 Thierry Parmentelat - VserverReference-4.2-6 +- empty change, this should *not* be a noarch package + +* Mon Apr 21 2008 Thierry Parmentelat - VserverReference-4.2-5 +- tweaked pre script that was removing everything under /vservers/.vref +- dismantle vcached (as far as this module is concerned) +- sudo to log in /var/log/sudo + +* Fri Mar 28 2008 Thierry Parmentelat - VserverReference-4.2-3 VserverReference-4.2-4 +- bugfix, 4.2-3 was broken as the slicefamily stamp could not get created, thus nm issued 'vuseradd -t default' + +* Wed Mar 26 2008 Thierry Parmentelat - VserverReference-4.2-2 VserverReference-4.2-3 +- a single node can now install several instances of this package +- package name contains slicefamily - -- +- setattr --iunlink or --~iunlink appropriately (uses /proc/virtual/info) +- does not copy yum.conf from host anymore + +* Fri Feb 15 2008 Thierry Parmentelat - vserver-4.2-1 vserver-4.2-2 +- vserver image to properly use links rather than copies + +* Thu Jan 31 2008 Thierry Parmentelat - vserver-4.2-0 vserver-4.2-1 +- more careful scan of the vserver-*.pkgs image specifications + +* Tue Sep 1 2005 Mark Huang 3.1-1.planetlab +- Pre-package vserver-reference instead of building it on nodes + +* 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. + +* 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 + +* 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 + +* 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