X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=vserver-reference.spec;h=9923bf025ea6eacd2e6dade238e43fa06b8b6adf;hb=ce08acdc622103b29b667069d253b45928c6779c;hp=6815d2010496825037e69d87cc7f7760f474d235;hpb=ff6e85ee31115e636daa80e6c15c781bea94d6c7;p=sliceimage.git

diff --git a/vserver-reference.spec b/vserver-reference.spec
index 6815d20..9923bf0 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 5
 
 # 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
+# other archs must be able to install this
+BuildArch: noarch
 
 Vendor: PlanetLab
 Packager: PlanetLab Central <support@planet-lab.org>
@@ -37,7 +39,6 @@ Summary: VServer reference image
 Group: Applications/System
 AutoReqProv: no
 Requires: util-vserver, e2fsprogs, yum
-Requires(pre): /bin/sh, coreutils
 
 %description %{slicefamily}
 This package creates the virtual server (VServer) reference image used
@@ -49,9 +50,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
@@ -94,34 +95,21 @@ fi
 
 %files systemslices-%{slicefamily}
 %defattr(-,root,root)
-/vservers/.vstub
+/vservers/.vstub/%{slicefamily}
 
 %define vcached_pid /var/run/vcached.pid
 
 %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
+rm -rf /vservers/.vref/%{slicefamily}
 
-# Allow vcached to run again
-rm -f %{vcached_pid}
+%pre systemslices-%{slicefamily}
+rm -rf /vservers/.vstub/%{slicefamily}
 
 %post %{slicefamily}
 chkconfig --add vserver-reference
 chkconfig vserver-reference on
 # store the default for nodemanager
-[ -f /etc/planetlab/slicefamily ] || echo %{slicefamily} > /etc/planetlab/slicefamily
+[ -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 +118,14 @@ H=$((24 * $RANDOM / 32768))
 sed -i -e "s/@M@/$M/" -e "s/@H@/$H/" %{_sysconfdir}/cron.d/vserver-reference
 
 %changelog
+* Mon Apr 21 2008 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - 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 <thierry.parmentelat@sophia.inria.fr> - 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 <thierry.parmentelat@sophia.inria.fr> - VserverReference-4.2-2 VserverReference-4.2-3
 - a single node can now install several instances of this package
 - package name contains slicefamily - <pldistro>-<fcdistro>-<arch>