/[smeserver]/rpms/e-smith-base/sme10/e-smith-base-5.8.1-bz12335-systemdloop.patch
ViewVC logotype

Annotation of /rpms/e-smith-base/sme10/e-smith-base-5.8.1-bz12335-systemdloop.patch

Parent Directory Parent Directory | Revision Log Revision Log | View Revision Graph Revision Graph


Revision 1.1 - (hide annotations) (download)
Mon Aug 14 18:49:38 2023 UTC (15 months, 2 weeks ago) by jpp
Branch: MAIN
CVS Tags: e-smith-base-5_8_1-29_el7_sme, e-smith-base-5_8_1-31_el7_sme, e-smith-base-5_8_1-30_el7_sme, HEAD
* Mon Aug 14 2023 Jean-Philippe Pialasse <tests@pialasse.com> 5.8.1-29.sme
- fix systemd loop during bootstrap console restore [SME: 12335]

1 jpp 1.1 diff -Nur --no-dereference e-smith-base-5.8.1.old/root/etc/e-smith/events/actions/logrotate-migrate e-smith-base-5.8.1/root/etc/e-smith/events/actions/logrotate-migrate
2     --- e-smith-base-5.8.1.old/root/etc/e-smith/events/actions/logrotate-migrate 2023-08-14 12:54:41.801000000 -0400
3     +++ e-smith-base-5.8.1/root/etc/e-smith/events/actions/logrotate-migrate 2023-08-14 14:42:57.439000000 -0400
4     @@ -43,10 +43,12 @@
5     fi
6     done
7    
8     +# exit if we are running bootstrap-console.service, to avoid systemd queue loop
9     +/usr/bin/systemctl --quiet is-active bootstrap-console.service && exit 0;
10     # restart the needed services
11     if [ $found -gt 0 ] ; then
12     /usr/bin/systemctl daemon-reload > /dev/null 2>/dev/null
13     - /usr/bin/systemctl reload httpd-*.service > /dev/null 2>/dev/null
14     - /usr/bin/systemctl restart rsyslog.service > /dev/null 2>/dev/null
15     + /usr/bin/systemctl --quiet is-active httpd-*.service && /usr/bin/systemctl reload httpd-*.service > /dev/null 2>/dev/null
16     + /usr/bin/systemctl --quiet is-active rsyslog.service && /usr/bin/systemctl restart rsyslog.service > /dev/null 2>/dev/null
17     fi
18    

admin@koozali.org
ViewVC Help
Powered by ViewVC 1.2.1 RSS 2.0 feed