Fix handling of claiming in kickstart script when running as non-root. (#11507)
Austin S. Hemmelgarn committed
Sep 27, 2021 at 11:07 UTC
07d3588871f7fd8f4b05a0ea70481181e413e4e2
4 files changed
+4
-4
packaging/installer/kickstart-static64.sh
+1
-1
@@ -222,7 +222,7 @@ claim() {
222
progress "Attempting to claim agent to ${NETDATA_CLAIM_URL}"
223
NETDATA_CLAIM_PATH=/opt/netdata/bin/netdata-claim.sh
224
225
- if "${NETDATA_CLAIM_PATH}" -token=${NETDATA_CLAIM_TOKEN} -rooms=${NETDATA_CLAIM_ROOMS} -url=${NETDATA_CLAIM_URL} ${NETDATA_CLAIM_EXTRA}; then
225
+ if ${sudo} "${NETDATA_CLAIM_PATH}" -token=${NETDATA_CLAIM_TOKEN} -rooms=${NETDATA_CLAIM_ROOMS} -url=${NETDATA_CLAIM_URL} ${NETDATA_CLAIM_EXTRA}; then
226
progress "Successfully claimed node"
227
return 0
228
else
packaging/installer/kickstart.sh
+1
-1
@@ -308,7 +308,7 @@ claim() {
308
NETDATA_CLAIM_PATH="${NETDATA_PREFIX}/netdata/usr/sbin/netdata-claim.sh"
309
fi
310
311
- if "${NETDATA_CLAIM_PATH}" -token=${NETDATA_CLAIM_TOKEN} -rooms=${NETDATA_CLAIM_ROOMS} -url=${NETDATA_CLAIM_URL} ${NETDATA_CLAIM_EXTRA}; then
311
+ if ${sudo} "${NETDATA_CLAIM_PATH}" -token=${NETDATA_CLAIM_TOKEN} -rooms=${NETDATA_CLAIM_ROOMS} -url=${NETDATA_CLAIM_URL} ${NETDATA_CLAIM_EXTRA}; then
312
progress "Successfully claimed node"
313
return 0
314
else
packaging/installer/methods/kickstart-64.md
+1
-1
@@ -97,7 +97,7 @@ To use `md5sum` to verify the integrity of the `kickstart-static64.sh` script yo
97
command above, run the following:
98
99
```bash
100
-[ "de3ae7eed8eefc48fe40ae52cead261b" = "$(curl -Ss https://my-netdata.io/kickstart-static64.sh | md5sum | cut -d ' ' -f 1)" ] && echo "OK, VALID" || echo "FAILED, INVALID"
100
+[ "5a55053b11cb1aedbe362daaa3fc3b1b" = "$(curl -Ss https://my-netdata.io/kickstart-static64.sh | md5sum | cut -d ' ' -f 1)" ] && echo "OK, VALID" || echo "FAILED, INVALID"
101
```
102
103
If the script is valid, this command will return `OK, VALID`.
packaging/installer/methods/kickstart.md
+1
-1
@@ -90,7 +90,7 @@ To use `md5sum` to verify the integrity of the `kickstart.sh` script you will do
90
run the following:
91
92
```bash
93
-[ "755019025d721fc199d52f7fb62d3420" = "$(curl -Ss https://my-netdata.io/kickstart.sh | md5sum | cut -d ' ' -f 1)" ] && echo "OK, VALID" || echo "FAILED, INVALID"
93
+[ "146d9b21dc692e93b3856da92aa46b7e" = "$(curl -Ss https://my-netdata.io/kickstart.sh | md5sum | cut -d ' ' -f 1)" ] && echo "OK, VALID" || echo "FAILED, INVALID"
94
```
95
96
If the script is valid, this command will return `OK, VALID`.