Make usage of initscripts optional

Do not depend hard on initscript just to provide fancy colored status.
When started from systemd, it does not really matter.

Return exactly the same return code as returned by the original tool.
This commit is contained in:
Petr Menšík 2020-05-22 11:25:14 +02:00
parent f9201b844d
commit 674cbdbb3e
2 changed files with 15 additions and 1 deletions

View File

@ -1606,6 +1606,7 @@ fi;
%changelog %changelog
* Fri May 15 2020 Petr Menšík <pemensik@redhat.com> - 32:9.11.19-1 * Fri May 15 2020 Petr Menšík <pemensik@redhat.com> - 32:9.11.19-1
- Update to 9.11.19 (CVE-2020-8616, CVE-2020-8617) - Update to 9.11.19 (CVE-2020-8616, CVE-2020-8617)
- Make initscripts just optional dependency
* Tue Apr 21 2020 Björn Esser <besser82@fedoraproject.org> - 32:9.11.18-2 * Tue Apr 21 2020 Björn Esser <besser82@fedoraproject.org> - 32:9.11.18-2
- Rebuild (json-c) - Rebuild (json-c)

View File

@ -1,6 +1,17 @@
#!/bin/bash #!/bin/bash
. /etc/rc.d/init.d/functions if [ -r /etc/rc.d/init.d/functions ]; then
. /etc/rc.d/init.d/functions
else
success() {
echo $" OK "
}
failure() {
echo -n " "
echo $"FAILED"
}
fi
# This script generates /etc/rndc.key if doesn't exist AND if there is no rndc.conf # This script generates /etc/rndc.key if doesn't exist AND if there is no rndc.conf
@ -14,7 +25,9 @@ if [ ! -s /etc/rndc.key -a ! -s /etc/rndc.conf ]; then
success $"/etc/rndc.key generation" success $"/etc/rndc.key generation"
echo echo
else else
rc=$?
failure $"/etc/rndc.key generation" failure $"/etc/rndc.key generation"
echo echo
exit $rc
fi fi
fi fi