X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=vserver-reference.spec;h=4312f0848ef43e248e9917ce23a599aa0b03fcc5;hb=714ea335aa0e47a673b765eb894bc02a39466b05;hp=5c234257742c1789a70c3b75d71cdbbb2452499c;hpb=1a84836ede0bb6d5ae36d2e2a0ba1d807281ab58;p=vserver-reference.git diff --git a/vserver-reference.spec b/vserver-reference.spec index 5c23425..4312f08 100644 --- a/vserver-reference.spec +++ b/vserver-reference.spec @@ -7,7 +7,7 @@ %define name vserver %define version 4.2 -%define taglevel 3 +%define taglevel 16 # pldistro already in the rpm name #%define release %{taglevel}%{?pldistro:.%{pldistro}}%{?date:.%{date}} @@ -21,6 +21,8 @@ Source0: %{name}-%{version}.tar.bz2 License: GPL Group: Applications/System BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot +# this would not be right +#BuildArch: noarch Vendor: PlanetLab Packager: PlanetLab Central @@ -37,7 +39,7 @@ Summary: VServer reference image Group: Applications/System AutoReqProv: no Requires: util-vserver, e2fsprogs, yum -Requires(pre): /bin/sh, coreutils +Requires(pre): util-vserver-core, findutils %description %{slicefamily} This package creates the virtual server (VServer) reference image used @@ -49,9 +51,9 @@ Group: Applications/System Requires: vserver-%{slicefamily} >= %{version}-%{release} AutoReqProv: no -%description systemslices-%{slicefamily} -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 @@ -65,26 +67,15 @@ popd 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 +install -D -m 755 initscripts/vserver-reference $RPM_BUILD_ROOT/%{_initrddir}/vserver-reference +install -D -m 644 cron.d/vserver-reference $RPM_BUILD_ROOT/%{_sysconfdir}/cron.d/vserver-reference +install -D -m 644 logrotate/vserver-reference $RPM_BUILD_ROOT/%{_sysconfdir}/logrotate.d/vserver-reference find vservers | cpio -p -d -u $RPM_BUILD_ROOT/ popd %clean rm -rf $RPM_BUILD_ROOT -# If run under sudo -if [ -n "$SUDO_USER" ] ; then - # Allow user to delete the build directory - 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 -h -R $SUDO_USER %{_rpmdir}/%{_arch} -fi - %files %{slicefamily} %defattr(-,root,root) %{_initrddir}/vserver-reference @@ -94,34 +85,19 @@ fi %files systemslices-%{slicefamily} %defattr(-,root,root) -/vservers/.vstub +/vservers/.vstub/%{slicefamily} %define vcached_pid /var/run/vcached.pid +# XXX: UGLY HACK %pre %{slicefamily} -# 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/.vref ] ; then - mv /vservers/.vref /vservers/.vtmp/.vref.$RANDOM -fi -if [ -d /vservers/.vcache ] ; then - mv /vservers/.vcache /vservers/.vtmp/.vcache.$RANDOM -fi - -# Allow vcached to run again -rm -f %{vcached_pid} +test -d /vservers/.vref/%{slicefamily} && \ + find /vservers/.vref/%{slicefamily} -print0 | xargs -0 setattr --~iunlink +: %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 @@ -130,6 +106,48 @@ H=$((24 * $RANDOM / 32768)) sed -i -e "s/@M@/$M/" -e "s/@H@/$H/" %{_sysconfdir}/cron.d/vserver-reference %changelog +* 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 + +* 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 - --