X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sliceimage.spec;h=57402d01b1672ec12826f78df4430772e3ff060e;hb=bd5e506603d7531712b9fa61c625460cef18e247;hp=09a48608ff970d986b9cb24a93d6c360a5786b9a;hpb=2c18a6dbfd777732171c36a76273bc401f01f9f2;p=vserver-reference.git

diff --git a/sliceimage.spec b/sliceimage.spec
index 09a4860..57402d0 100644
--- a/sliceimage.spec
+++ b/sliceimage.spec
@@ -2,7 +2,7 @@
 
 %define name sliceimage
 %define version 5.1
-%define taglevel 1
+%define taglevel 0
 
 # pldistro already in the rpm name
 #%define release %{taglevel}%{?pldistro:.%{pldistro}}%{?date:.%{date}}
@@ -41,7 +41,6 @@ This package does not really exist.
 Summary: Slice reference image for creating slivers
 Group: Applications/System
 AutoReqProv: no
-Requires: util-vserver, e2fsprogs, yum
 # in 5.0, this package was named vserver-<>
 Obsoletes: vserver-%{slicefamily}
 
@@ -74,9 +73,6 @@ popd
 rm -rf $RPM_BUILD_ROOT
 
 pushd sliceimage
-install -D -m 755 initscripts/sliceimage $RPM_BUILD_ROOT/%{_initrddir}/sliceimage
-install -D -m 644 cron.d/sliceimage $RPM_BUILD_ROOT/%{_sysconfdir}/cron.d/sliceimage
-install -D -m 644 logrotate/sliceimage $RPM_BUILD_ROOT/%{_sysconfdir}/logrotate.d/sliceimage
 # the path for the root of these is still /vservers/ for compat
 find vservers | cpio -p -d -u $RPM_BUILD_ROOT/
 popd
@@ -86,31 +82,29 @@ rm -rf $RPM_BUILD_ROOT
 
 %files %{slicefamily}
 %defattr(-,root,root)
-%{_initrddir}/sliceimage
-%{_sysconfdir}/cron.d/sliceimage
-%{_sysconfdir}/logrotate.d/sliceimage
 /vservers/.vref/%{slicefamily}
 
 %files system-%{slicefamily}
 %defattr(-,root,root)
 /vservers/.vstub/%{slicefamily}
 
-%define vcached_pid /var/run/vcached.pid
-
+### for upgrades
 %post %{slicefamily}
-chkconfig --add sliceimage
-chkconfig sliceimage on
-[ "$PL_BOOTCD" = "1" ] || service sliceimage start
-
-# 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/sliceimage
+#[ "$PL_BOOTCD" = "1" ] || service vserver-sliceimage start
+[ "$PL_BOOTCD" = "1" ] && return
+# remove explicit reference to vserver, find out all relevant scripts
+for initscript in /etc/init.d/*sliceimage*; do $initscript start ; done
 
-%post system-%{slicefamily}
 # need to do this for system slices, for when a new image shows up
 # we've already the service installed and enabled, as systemslices requires the plain package
-[ "$PL_BOOTCD" = "1" ] || service sliceimage force
+%post system-%{slicefamily}
+#[ "$PL_BOOTCD" = "1" ] || service vserver-sliceimage force
+[ "$PL_BOOTCD" = "1" ] && return
+# remove explicit reference to vserver, find out all relevant scripts
+for initscript in /etc/init.d/*sliceimage*; do $initscript force ; done
+
+
+#%define vcached_pid /var/run/vcached.pid
 
 %changelog
 * Mon Jan 24 2011 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - vserver-reference-5.0-6