From: Thomas Dreibholz <dreibh@simula.no>
Date: Mon, 21 Jul 2014 11:17:45 +0000 (+0200)
Subject: Post install fixed:
X-Git-Tag: sliceimage-5.1-9~2
X-Git-Url: http://git.onelab.eu/?p=sliceimage.git;a=commitdiff_plain;h=2e5f67d79560a44fb77700ab05acd9ff023f7e60

Post install fixed:
- exit instead of return
- Only call init script when there are init scripts.
---

diff --git a/sliceimage.spec b/sliceimage.spec
index 0a9f387..20e8d7d 100644
--- a/sliceimage.spec
+++ b/sliceimage.spec
@@ -88,16 +88,26 @@ rm -rf $RPM_BUILD_ROOT
 
 ### for upgrades
 %post
-[ "$PL_BOOTCD" = "1" ] && return
+if [ "$PL_BOOTCD" = "1" ] ; then
+   exit 0
+fi
 # remove explicit reference to vserver, find out all relevant scripts
-for initscript in /etc/init.d/*sliceimage*; do $initscript start ; done
+initScripts=`find /etc/init.d/ -name '*sliceimage*'`
+if [ "$initScripts" != "" ] ; then
+   for initscript in $initScripts ; do $initscript start ; done
+fi
 
 # 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 -n sliceimage-system-%{slicefamily}
-[ "$PL_BOOTCD" = "1" ] && return
+if [ "$PL_BOOTCD" = "1" ] ; then
+   exit 0
+fi
 # remove explicit reference to vserver, find out all relevant scripts
-for initscript in /etc/init.d/*sliceimage*; do $initscript force ; done
+initScripts=`find /etc/init.d/ -name '*sliceimage*'`
+if [ "$initScripts" != "" ] ; then
+   for initscript in $initScripts ; do $initscript start ; done
+fi
 
 
 #%define vcached_pid /var/run/vcached.pid