General fixes to the installer. (#7698)
* Don't assume `netdata` is in ${PATH} when restarting. * Actually capture the output of where `nologin` is.
Austin S. Hemmelgarn committed
Jan 9, 2020 at 10:45 UTC
8964a3aaf6ca3e90f3c1ef35a9a9d4835fc3e5cb
1 file changed
+6
-2
packaging/installer/functions.sh
+6
-2
@@ -332,7 +332,7 @@ install_non_systemd_init() {
332
333
NETDATA_START_CMD="netdata"
334
NETDATA_STOP_CMD="killall netdata"
335
-NETDATA_INSTALLER_START_CMD="${NETDATA_START_CMD}"
335
+NETDATA_INSTALLER_START_CMD=""
336
NETDATA_INSTALLER_STOP_CMD="${NETDATA_STOP_CMD}"
337
338
install_netdata_service() {
@@ -513,6 +513,10 @@ restart_netdata() {
513
514
progress "Restarting netdata instance"
515
516
+ if [ -z "${NETDATA_INSTALLER_START_CMD}" ] ; then
517
+ NETDATA_INSTALLER_START_CMD="${netdata}"
518
+ fi
519
+
520
if [ "${UID}" -eq 0 ]; then
521
echo >&2
522
echo >&2 "Stopping all netdata threads"
@@ -627,7 +631,7 @@ portable_add_user() {
631
echo >&2 "Adding ${username} user account with home ${homedir} ..."
632
633
# shellcheck disable=SC2230
630
- local nologin="$(command -v nologin >/dev/null 2>&1 || echo '/bin/false')"
634
+ local nologin="$(command -v nologin || echo '/bin/false')"
635
636
# Linux
637
if command -v useradd 1>/dev/null 2>&1; then