X-Git-Url: http://git.onelab.eu/?p=nodeimage.git;a=blobdiff_plain;f=slicerepo.spec;h=6851d788f62e52f2913295970faea041e65dd6d0;hp=86e3cdda9a3048ed263367d06381f5885e48cd57;hb=3b0296fbb51b65a26bdfe58d08779ed2bdb8db41;hpb=7ac37b2106283238e2df601b0c5be59acbf3d0a5

diff --git a/slicerepo.spec b/slicerepo.spec
index 86e3cdd..6851d78 100644
--- a/slicerepo.spec
+++ b/slicerepo.spec
@@ -8,7 +8,7 @@
 
 %define name slicerepo-%{nodefamily}
 %define version 5.2
-%define taglevel 3
+%define taglevel 4
 
 # pldistro already in the rpm name
 #%define release %{taglevel}%{?pldistro:.%{pldistro}}%{?date:.%{date}}
@@ -67,7 +67,15 @@ install -D -m 644 %{_topdir}/RPMS/yumgroups.xml $RPM_BUILD_ROOT/var/www/html/ins
 rm -rf $RPM_BUILD_ROOT
 
 %post
-service plc start packages
+if [ ! -e /bin/systemctl ] ; then
+   echo "Systemd is not there. Just starting PLC to handle packages (may fail of PLC is not configured) ..."
+   service plc start packages
+elif /bin/systemctl status plc >/dev/null ; then
+   echo "Restarting PLC to handle packages ..."
+   service plc restart packages
+else
+   echo "The PLC is not running. Skipping a restart ..."
+fi
 
 %files
 %defattr(-,root,root,-)
@@ -76,6 +84,13 @@ service plc start packages
 %config(noreplace) /var/www/html/install-rpms/slice-%{nodefamily}/yumgroups.xml
 
 %changelog
+* Wed Feb 18 2015 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - nodeimage-5.2-4
+- minor change; start plc packages only at run-time, not build-time
+- only available on systems that have systemctl
+
+* Tue Jul 22 2014 Thomas Dreibholz <dreibh@simula.no> - nodeimage-5.2-4
+- Post-install fix: trying to start PLC only when it is running, in order to avoid false-positive error message during build.
+
 * Fri Mar 21 2014 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - nodeimage-5.2-3
 - template for f20 yum config