X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sliceimage.spec;h=ba97e98b8faa320c4f926764d6cde7b2c118a6ec;hb=edf7cae57e72c28ecb0df203a3a5514ab6d78e3e;hp=2d76997e0b70e3b7f6926f588a27632b4fb570b2;hpb=e7ad727221575d4adb262862b0823e985e679fb9;p=sliceimage.git

diff --git a/sliceimage.spec b/sliceimage.spec
index 2d76997..ba97e98 100644
--- a/sliceimage.spec
+++ b/sliceimage.spec
@@ -9,7 +9,7 @@
 
 %define name sliceimage
 %define version 5.1
-%define taglevel 7
+%define taglevel 10
 
 # pldistro already in the rpm name
 #%define release %{taglevel}%{?pldistro:.%{pldistro}}%{?date:.%{date}}
@@ -88,21 +88,41 @@ 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 force ; done
+fi
 
 
 #%define vcached_pid /var/run/vcached.pid
 
 %changelog
+* Wed Feb 18 2015 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - sliceimage-5.1-10
+- fixed taglevel in specfile
+
+* Tue Jul 22 2014 Thomas Dreibholz <dreibh@simula.no> - sliceimage-5.1-9
+- Post-install fix: exit instead of return
+- Post-install fix: only call init script when there are init scripts
+
+* Wed Jul 16 2014 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - sliceimage-5.1-8
+- use systemd unit files to initialize lxc-sliceimage instead of a sysv script
+
 * Mon Apr 28 2014 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - sliceimage-5.1-7
 - can build pips and gems in sliceimage (currently only gem used in omf)
 - requires a recent build/pkgs.py if pkgs file does mention pip or gem