From: Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Date: Thu, 29 Mar 2012 11:51:10 +0000 (+0200)
Subject: fixes
X-Git-Tag: sliceimage-5.1-1~12
X-Git-Url: http://git.onelab.eu/?p=vserver-reference.git;a=commitdiff_plain;h=6ebbbc633f8ab9135c929886cf54ffe2b5d6a304

fixes
---

diff --git a/sliceimage.spec b/sliceimage.spec
index 87c536a..a233cef 100644
--- a/sliceimage.spec
+++ b/sliceimage.spec
@@ -88,6 +88,19 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root)
 /vservers/.vstub/%{slicefamily}
 
+### for upgrades
+%post ${slicefamily}
+[ "$PL_BOOTCD" = "1" ] && return
+for initscript in /etc/init.d/*sliceimage*; do $initscript start ; done
+
+# 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
+%post system-%{slicefamily}
+[ "$PL_BOOTCD" = "1" ] && return
+for initscript in /etc/init.d/*sliceimage*; do $initscript force ; done
+#[ "$PL_BOOTCD" = "1" ] || service vserver-sliceimage force
+
+
 #%define vcached_pid /var/run/vcached.pid
 
 %changelog
diff --git a/vserver-sliceimage.spec b/vserver-sliceimage.spec
index 522123a..2a3fc55 100644
--- a/vserver-sliceimage.spec
+++ b/vserver-sliceimage.spec
@@ -41,22 +41,14 @@ install -D -m 644 logrotate/sliceimage $RPM_BUILD_ROOT/%{_sysconfdir}/logrotate.
 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