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:
parent
7fe31e1892
commit
23458b3db1
|
@ -1159,6 +1159,7 @@ fi;
|
||||||
%changelog
|
%changelog
|
||||||
* Wed May 20 2020 Petr Menšík <pemensik@redhat.com> - 32:9.16.3-1
|
* Wed May 20 2020 Petr Menšík <pemensik@redhat.com> - 32:9.16.3-1
|
||||||
- Update to 9.16.3
|
- Update to 9.16.3
|
||||||
|
- Make initscripts just optional dependency
|
||||||
|
|
||||||
* Mon Apr 27 2020 Petr Menšík <pemensik@redhat.com> - 32:9.16.2-4
|
* Mon Apr 27 2020 Petr Menšík <pemensik@redhat.com> - 32:9.16.2-4
|
||||||
- Enable PKCS#11 builds again
|
- Enable PKCS#11 builds again
|
||||||
|
|
|
@ -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,8 +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 1
|
exit $rc
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
Loading…
Reference in New Issue