diff options
| author | Austin S. Hemmelgarn <austin@netdata.cloud> | 2020-01-09 10:45:09 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-01-09 10:45:09 -0500 |
| commit | 8964a3aaf6ca3e90f3c1ef35a9a9d4835fc3e5cb (patch) | |
| tree | c835b1b68dd5ff92fdbeceee05292baf56d99959 /packaging | |
| parent | 652de65bdcd7c327882270ffb40fdf1d0276a17a (diff) | |
General fixes to the installer. (#7698)
* Don't assume `netdata` is in ${PATH} when restarting.
* Actually capture the output of where `nologin` is.
Diffstat (limited to 'packaging')
| -rw-r--r-- | packaging/installer/functions.sh | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/packaging/installer/functions.sh b/packaging/installer/functions.sh index f2fd269496..d15494434f 100644 --- a/packaging/installer/functions.sh +++ b/packaging/installer/functions.sh @@ -332,7 +332,7 @@ install_non_systemd_init() { NETDATA_START_CMD="netdata" NETDATA_STOP_CMD="killall netdata" -NETDATA_INSTALLER_START_CMD="${NETDATA_START_CMD}" +NETDATA_INSTALLER_START_CMD="" NETDATA_INSTALLER_STOP_CMD="${NETDATA_STOP_CMD}" install_netdata_service() { @@ -513,6 +513,10 @@ restart_netdata() { progress "Restarting netdata instance" + if [ -z "${NETDATA_INSTALLER_START_CMD}" ] ; then + NETDATA_INSTALLER_START_CMD="${netdata}" + fi + if [ "${UID}" -eq 0 ]; then echo >&2 echo >&2 "Stopping all netdata threads" @@ -627,7 +631,7 @@ portable_add_user() { echo >&2 "Adding ${username} user account with home ${homedir} ..." # shellcheck disable=SC2230 - local nologin="$(command -v nologin >/dev/null 2>&1 || echo '/bin/false')" + local nologin="$(command -v nologin || echo '/bin/false')" # Linux if command -v useradd 1>/dev/null 2>&1; then |