give instructions using service or systemctl if they are available
Costa Tsaousis (ktsaou) committed
May 26, 2017 at 21:18 UTC
dbe9a655193ede02450e555c2db67ceb3cb78fab
2 files changed
+24
-9
installer/functions.sh
+19
-5
@@ -120,13 +120,13 @@ systemctl_cmd="$(which_cmd systemctl)"
120
service() {
121
local cmd="${1}" action="${2}"
122
123
- if [ ! -z "${service_cmd}" ]
123
+ if [ ! -z "${systemctl_cmd}" ]
124
then
125
- run "${service_cmd}" "${cmd}" "${action}"
125
+ run "${systemctl_cmd}" "${action}" "${cmd}"
126
return $?
127
- elif [ ! -z "${systemctl_cmd}" ]
127
+ elif [ ! -z "${service_cmd}" ]
128
then
129
- run "${systemctl_cmd}" "${action}" "${cmd}"
129
+ run "${service_cmd}" "${cmd}" "${action}"
130
return $?
131
fi
132
return 1
@@ -442,12 +442,18 @@ install_non_systemd_init() {
442
return 1
443
}
444
445
+NETDATA_START_CMD="netdata"
446
+NETDATA_STOP_CMD="killall netdata"
447
+
448
install_netdata_service() {
449
if [ "${UID}" -eq 0 ]
450
then
451
if issystemd
452
then
453
# systemd is running on this system
454
+ NETDATA_START_CMD="systemctl start netdata"
455
+ NETDATA_STOP_CMD="systemctl stop netdata"
456
+
457
if [ ! -f /etc/systemd/system/netdata.service ]
458
then
459
echo >&2 "Installing systemd service..."
@@ -461,7 +467,15 @@ install_netdata_service() {
467
fi
468
else
469
install_non_systemd_init
464
- return $?
470
+ local ret=$?
471
+
472
+ if [ ${ret} -eq 0 ]
473
+ then
474
+ NETDATA_START_CMD="service netdata start"
475
+ NETDATA_STOP_CMD="service netdata stop"
476
+ fi
477
+
478
+ return ${ret}
479
fi
480
fi
481
netdata-installer.sh
+5
-4
@@ -799,6 +799,7 @@ fi
799
# -----------------------------------------------------------------------------
800
progress "Install netdata at system init"
801
802
+NETDATA_START_CMD="${NETDATA_PREFIX}/usr/sbin/netdata"
803
install_netdata_service || run_failed "Cannot install netdata init service."
804
805
@@ -1131,13 +1132,13 @@ so you can access it with:
1132
1133
${TPUT_CYAN}${TPUT_BOLD}http://this.machine.ip:${NETDATA_PORT}/${TPUT_RESET}
1134
1134
-To stop netdata, just kill it, with:
1135
+To stop netdata run:
1136
1136
- ${TPUT_YELLOW}${TPUT_BOLD}killall netdata${TPUT_RESET}
1137
+ ${TPUT_YELLOW}${TPUT_BOLD}${NETDATA_STOP_CMD}${TPUT_RESET}
1138
1138
-To start it, just run it:
1139
+To start netdata run:
1140
1140
- ${TPUT_YELLOW}${TPUT_BOLD}${NETDATA_PREFIX}/usr/sbin/netdata${TPUT_RESET}
1141
+ ${TPUT_YELLOW}${TPUT_BOLD}${NETDATA_START_CMD}${TPUT_RESET}
1142
1143
1144
END