X-Git-Url: http://git.onelab.eu/?p=vserver-reference.git;a=blobdiff_plain;f=vserver-sliceimage.spec;h=793b2e137bd3e1deb9595aab3ffd64ae3a0b3c1d;hp=522123a7a8a4d80e661264a572e32827aa46601f;hb=HEAD;hpb=65ac7d012228ac677913d1bed4c07f28ef57cb57

diff --git a/vserver-sliceimage.spec b/vserver-sliceimage.spec
index 522123a..793b2e1 100644
--- a/vserver-sliceimage.spec
+++ b/vserver-sliceimage.spec
@@ -1,6 +1,6 @@
 %define name vserver-sliceimage
 %define version 5.1
-%define taglevel 0
+%define taglevel 12
 
 %define release %{taglevel}%{?pldistro:.%{pldistro}}%{?date:.%{date}}
 
@@ -33,30 +33,24 @@ handles cow flags, and various cleanups
 %install
 rm -rf $RPM_BUILD_ROOT
 
-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
+install -D -m 755 initscripts/vserver-sliceimage $RPM_BUILD_ROOT/%{_initrddir}/vserver-sliceimage
+install -D -m 644 cron.d/vserver-sliceimage $RPM_BUILD_ROOT/%{_sysconfdir}/cron.d/vserver-sliceimage
+install -D -m 644 logrotate/vserver-sliceimage $RPM_BUILD_ROOT/%{_sysconfdir}/logrotate.d/vserver-sliceimage
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
-%{_initrddir}/sliceimage
-%{_sysconfdir}/cron.d/sliceimage
-%{_sysconfdir}/logrotate.d/sliceimage
+%{_initrddir}/vserver-sliceimage
+%{_sysconfdir}/cron.d/vserver-sliceimage
+%{_sysconfdir}/logrotate.d/vserver-sliceimage
 
 %post
-chkconfig --add sliceimage
-chkconfig sliceimage on
-[ "$PL_BOOTCD" = "1" ] || service sliceimage start
+chkconfig --add vserver-sliceimage
+chkconfig vserver-sliceimage on
 
-# Randomize daily run time
+# Randomize hourly run time (used to be daily)
+#H=$((24 * $RANDOM / 32768))
+#sed -i -e "s/@M@/$M/" -e "s/@H@/$H/" %{_sysconfdir}/cron.d/lxc-sliceimage
 M=$((60 * $RANDOM / 32768))
-H=$((24 * $RANDOM / 32768))
-sed -i -e "s/@M@/$M/" -e "s/@H@/$H/" %{_sysconfdir}/cron.d/sliceimage
-
-%post
-# 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
-
+sed -i -e "s/@M@/$M/" %{_sysconfdir}/cron.d/vserver-sliceimage