X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=slicerepo.spec;h=472b0d5012715ed566b8b775f393665f9861f8d1;hb=fcf979b65780a9095e8c1adcb6480be97bc9730f;hp=6fdcb9d4c20787e68644be2431ca33b3bd180a8a;hpb=c54d44a75e7bcc6c4f31cdc513c90c0dfb97ee44;p=bootstrapfs.git

diff --git a/slicerepo.spec b/slicerepo.spec
index 6fdcb9d..472b0d5 100644
--- a/slicerepo.spec
+++ b/slicerepo.spec
@@ -8,7 +8,7 @@
 
 %define name slicerepo-%{nodefamily}
 %define version 5.2
-%define taglevel 1
+%define taglevel 3
 
 # 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,15 @@ service plc start packages
 %config(noreplace) /var/www/html/install-rpms/slice-%{nodefamily}/yumgroups.xml
 
 %changelog
+* 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
+
+* Sun Jul 14 2013 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - nodeimage-5.2-2
+- more timestamps during build
+
 * Thu Mar 07 2013 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - nodeimage-5.2-1
 - add support for f18 yum config