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

diff --git a/vserver-sliceimage.spec b/vserver-sliceimage.spec
index 522123a..e4a2d16 100644
--- a/vserver-sliceimage.spec
+++ b/vserver-sliceimage.spec
@@ -33,30 +33,22 @@ 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
 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/" -e "s/@H@/$H/" %{_sysconfdir}/cron.d/vserver-sliceimage