X-Git-Url: http://git.onelab.eu/?p=bootstrapfs.git;a=blobdiff_plain;f=noderepo.spec;h=c40112b80c2d0f6ef24761b97efccf79eead148e;hp=dfce63045642fb3b75c10edf9865210a47961018;hb=HEAD;hpb=93020f79ee2cb2b95500bd4e5ed922ceb3bb217a diff --git a/noderepo.spec b/noderepo.spec index dfce630..c40112b 100644 --- a/noderepo.spec +++ b/noderepo.spec @@ -7,8 +7,8 @@ %define obsolete_nodefamily %{pldistro}-%{_arch} %define name noderepo-%{nodefamily} -%define version 2.1 -%define taglevel 0 +%define version 5.2 +%define taglevel 9 # pldistro already in the rpm name #%define release %{taglevel}%{?pldistro:.%{pldistro}}%{?date:.%{date}} @@ -75,7 +75,15 @@ rm -rf $RPM_BUILD_ROOT # as noderepo might get installed before myplc gets even started # this however exhibit a deadlock, as rpm --almatches -e gpg-pubkey waits for transaction lock # that is help by the calling yum/rpm -service plc start packages +if [ ! -e /bin/systemctl ] ; then + echo "Systemd is not there. Just starting PLC to handle packages (may fail if 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 "PLC is not running. Skipping a restart ..." +fi %files %defattr(-,root,root,-) @@ -84,6 +92,52 @@ service plc start packages %config(noreplace) /var/www/html/install-rpms/%{nodefamily}/yumgroups.xml %changelog +* Mon Jan 07 2019 Thierry - nodeimage-5.2-9 +- ok for f27 and f29 +- cleanup old distros + +* Sun Jul 16 2017 Thierry Parmentelat - nodeimage-5.2-8 +- fix the fedora and fedora-updates repo definitions for f25 +- add /etc/plc.d/packages index + +* Sun Jul 10 2016 Thierry Parmentelat - nodeimage-5.2-7 +- yum config ; deprecates old fedora releases, add support for f23/f24 + +* Fri Nov 13 2015 Thierry Parmentelat - nodeimage-5.2-6 +- fix for f22 and dnf.conf + +* Fri Jun 26 2015 Thierry Parmentelat - nodeimage-5.2-5 +- the yum config for nodes on f21 and f22 +- define a new config_file for /etc/dnf/dnf.conf so that /etc/yum.myplc.d +- is taken into account on f22 + +* Wed Feb 18 2015 Thierry Parmentelat - 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 - 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 - nodeimage-5.2-3 +- template for f20 yum config + +* Sun Jul 14 2013 Thierry Parmentelat - nodeimage-5.2-2 +- more timestamps during build + +* Thu Mar 07 2013 Thierry Parmentelat - nodeimage-5.2-1 +- add support for f18 yum config + +* Mon Feb 11 2013 Stephen Soltesz - nodeimage-2.1-4 + +* Mon Nov 26 2012 Thierry Parmentelat - nodeimage-2.1-3 +- fix /etc/plc.d/packages for empty install dirs + +* Fri Sep 28 2012 Thierry Parmentelat - nodeimage-2.1-2 +- exclude slice repos when running plc.d/packages start + +* Fri Apr 13 2012 Thierry Parmentelat - nodeimage-2.1-1 +- renamed as nodeimage - works on both mainline and lxc + * Thu Feb 16 2012 Thierry Parmentelat - bootstrapfs-2.0-14 - changes needed for build with yumexcludes defined in a separate pkgs file