X-Git-Url: http://git.onelab.eu/?p=sliceimage.git;a=blobdiff_plain;f=vserver-reference.spec;h=7e95d5ee4e25ebd1d9cc7905e44dc7b014d088d1;hp=21e4a67b8ad4c672e0f2c10599810734f3481526;hb=bcee3966ef52071c75ea8bfbaec3c74a942914d4;hpb=634d1b85eee2ab5ab0d7dcd5df7b2534a02f7a6b diff --git a/vserver-reference.spec b/vserver-reference.spec index 21e4a67..7e95d5e 100644 --- a/vserver-reference.spec +++ b/vserver-reference.spec @@ -1,13 +1,19 @@ +# +# $Id$ +# +%define url $URL$ + +%define slicefamily %{pldistro}-%{distroname}-%{_arch} + %define name vserver -%define version 4.0 -%define release 2%{?pldistro:.%{pldistro}}%{?date:.%{date}} +%define version 4.2 +%define taglevel 15 -Vendor: PlanetLab -Packager: PlanetLab Central -Distribution: PlanetLab 3.0 -URL: http://cvs.planet-lab.org/cvs/vserver-reference +# pldistro already in the rpm name +#%define release %{taglevel}%{?pldistro:.%{pldistro}}%{?date:.%{date}} +%define release %{taglevel}%{?date:.%{date}} -Summary: VServer reference image +Summary: VServer reference image for slice family %{slicefamily} Name: %{name} Version: %{version} Release: %{release} @@ -15,48 +21,55 @@ Source0: %{name}-%{version}.tar.bz2 License: GPL Group: Applications/System BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot -Requires: util-vserver, e2fsprogs, yum -Requires(pre): coreutils +# 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 reference +%package %{slicefamily} Summary: VServer reference image Group: Applications/System AutoReqProv: no +Requires: util-vserver, e2fsprogs, yum +Requires(pre): util-vserver-core, findutils -%description reference +%description %{slicefamily} This package creates the virtual server (VServer) reference image used as the installation base for new PlanetLab slivers. -%package system-packages +%package systemslices-%{slicefamily} Summary: System slice packages Group: Applications/System -Requires: vserver-reference = %{version}-%{release} +Requires: vserver-%{slicefamily} >= %{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. +%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 -pushd vserver-reference -./build.sh -r 4 -./system-packages.sh +pushd VserverReference +./build.sh %{pldistro} %{slicefamily} popd %install rm -rf $RPM_BUILD_ROOT -pushd vserver-reference +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 @@ -66,48 +79,38 @@ rm -rf $RPM_BUILD_ROOT # If run under sudo if [ -n "$SUDO_USER" ] ; then # Allow user to delete the build directory - chown -R $SUDO_USER . + chown -h -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} + chown -h -R $SUDO_USER %{_rpmdir}/%{_arch} fi -%files reference +%files %{slicefamily} %defattr(-,root,root) %{_initrddir}/vserver-reference %{_sysconfdir}/cron.d/vserver-reference -/vservers/vserver-reference +%{_sysconfdir}/logrotate.d/vserver-reference +/vservers/.vref/%{slicefamily} -%files system-packages +%files systemslices-%{slicefamily} %defattr(-,root,root) -/vservers/system-packages +/vservers/.vstub/%{slicefamily} %define vcached_pid /var/run/vcached.pid -%pre reference -# Stop vcached -if [ -r %{vcached_pid} ] ; then - kill $(cat %{vcached_pid}) -fi -echo $$ > %{vcached_pid} - -# 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 [ -d /vservers/.vcache ] ; then - mv /vservers/.vcache /vservers/.vtmp/.vcache.$RANDOM -fi - -# Allow vcached to run again -rm -f %{vcached_pid} +# XXX: UGLY HACK +%pre %{slicefamily} +test -d /vservers/.vref/%{slicefamily} && \ + find /vservers/.vref/%{slicefamily} -print0 | xargs -0 setattr --~iunlink +: -%post reference +%post %{slicefamily} chkconfig --add vserver-reference chkconfig vserver-reference on +# store the default for nodemanager +[ -f /etc/planetlab/slicefamily ] || { mkdir -p /etc/planetlab ; echo %{slicefamily} > /etc/planetlab/slicefamily ; } [ "$PL_BOOTCD" = "1" ] || service vserver-reference start # Randomize daily run time @@ -116,6 +119,56 @@ H=$((24 * $RANDOM / 32768)) sed -i -e "s/@M@/$M/" -e "s/@H@/$H/" %{_sysconfdir}/cron.d/vserver-reference %changelog +* Mon Oct 19 2009 Baris Metin - VserverReference-4.2-15 +- - comment out requiretty + +* Fri Oct 09 2009 Thierry Parmentelat - VserverReference-4.2-14 +- can use groups in the pkgs file with +++ for space + +* Mon Aug 10 2009 Stephen Soltesz - VserverReference-4.2-13 +- Added remove for all VROOTs rather than the last one. BUG FIX. + +* 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