* fix for --check-host routine

* better discovery for systemctl in include_os
* other smaller fixes
This commit is contained in:
patvdv
2019-03-22 18:18:50 +01:00
parent dc9adb907b
commit 7b01b5871f
3 changed files with 27 additions and 13 deletions
+4 -1
View File
@@ -31,7 +31,7 @@
function display_init
{
# ------------------------- CONFIGURATION starts here -------------------------
typeset _VERSION="2019-03-16" # YYYY-MM-DD
typeset _VERSION="2019-03-22" # YYYY-MM-DD
typeset _SUPPORTED_PLATFORMS="AIX,HP-UX,Linux" # uname -s match
# ------------------------- CONFIGURATION ends here ---------------------------
@@ -76,6 +76,9 @@ fi
if [[ -n "${_DISPLAY_MSG_CODE}" ]]
then
case "${_DISPLAY_MSG_CODE}" in
OK|ok)
_DISPLAY_COLOR="${_GREEN}"
;;
ERROR|error)
_DISPLAY_COLOR="${_MAGENTA}"
;;
+3 -2
View File
@@ -111,13 +111,14 @@ check_platform 'Linux' || {
# default is sysv
LINUX_INIT="sysv"
if [[ -r /usr/lib/systemd && -x /usr/bin/systemctl ]]
if [[ -r /usr/lib/systemd && -n "$(command -v systemctl 2>/dev/null)" ]]
then
LINUX_INIT="systemd"
elif [[ -r /usr/share/upstart ]]
then
# shellcheck disable=SC2034
LINUX_INIT="upstart"
fi
return 0
@@ -218,7 +219,7 @@ _NMCLI_BIN="$(command -v nmcli 2>/dev/null)"
if [[ -x ${_NMCLI_BIN} && -n "${_NMCLI_BIN}" ]]
then
# check for active
_HAS_NM=$(nmcli networking 2>/dev/null | grep -c -i "enabled")
_HAS_NM=$(nmcli networking 2>/dev/null | grep -c -i "enabled" 2>/dev/null)
else
(( ARG_DEBUG > 0 )) && debug "NetworkManager is not active here"
return 1