Fix install prefix handling for claiming code in new kickstart script. (#11999)
* Fix install prefix handling for claiming code in new kickstart script. The condition checking for an unprefixed install was insufficient, resulting in trying to use an incorrect path for claiming under some cases. * Update packaging/installer/kickstart.sh Co-authored-by: Ilya Mashchenko <ilya@netdata.cloud> * Fix checksums. Co-authored-by: Ilya Mashchenko <ilya@netdata.cloud>
Austin S. Hemmelgarn committed
Jan 18, 2022 at 17:00 UTC
c73a7a06d3ca52bd206d2c5f070904894802f952
2 files changed
+2
-2
packaging/installer/kickstart.sh
+1
-1
@@ -719,7 +719,7 @@ is_netdata_running() {
719
720
claim() {
721
progress "Attempting to claim agent to ${NETDATA_CLAIM_URL}"
722
- if [ -z "${INSTALL_PREFIX}" ]; then
722
+ if [ -z "${INSTALL_PREFIX}" ] || [ "${INSTALL_PREFIX}" = "/" ]; then
723
NETDATA_CLAIM_PATH=/usr/sbin/netdata-claim.sh
724
elif [ "${INSTALL_PREFIX}" = "/opt/netdata" ]; then
725
NETDATA_CLAIM_PATH="/opt/netdata/bin/netdata-claim.sh"
packaging/installer/methods/kickstart.md
+1
-1
@@ -140,7 +140,7 @@ To use `md5sum` to verify the integrity of the `kickstart.sh` script you will do
140
run the following:
141
142
```bash
143
-[ "ae8ba2e88a3239280b5e4a53ed792a71" = "$(curl -Ss https://my-netdata.io/kickstart.sh | md5sum | cut -d ' ' -f 1)" ] && echo "OK, VALID" || echo "FAILED, INVALID"
143
+[ "35776dd2432a11522680724dd020d98e" = "$(curl -Ss https://my-netdata.io/kickstart.sh | md5sum | cut -d ' ' -f 1)" ] && echo "OK, VALID" || echo "FAILED, INVALID"
144
```
145
146
If the script is valid, this command will return `OK, VALID`.