Fixed handling of offline installs. (#9805)
* Properly allow for offline installs. If the user specifies a local trball to use instead of downloading the code remotely, use the reinstall code path. * Updated checksums.
Austin S. Hemmelgarn committed
Aug 25, 2020 at 01:11 UTC
dde9663f52a73472fb4a7d1b8ba60466fa5230a4
4 files changed
+4
-4
packaging/installer/kickstart-static64.sh
+1
-1
@@ -268,7 +268,7 @@ if [ -n "$ndpath" ] ; then
268
269
if [ -r "${ndprefix}/etc/netdata/.environment" ] ; then
270
ndstatic="$(grep IS_NETDATA_STATIC_BINARY "${ndprefix}/etc/netdata/.environment" | cut -d "=" -f 2 | tr -d \")"
271
- if [ -z "${NETDATA_REINSTALL}" ] ; then
271
+ if [ -z "${NETDATA_REINSTALL}" ] && [ -z "${NETDATA_LOCAL_TARBALL_OVERRIDE}" ] ; then
272
if [ -x "${ndprefix}/usr/libexec/netdata/netdata-updater.sh" ] ; then
273
progress "Attempting to update existing install instead of creating a new one"
274
if run ${sudo} "${ndprefix}/usr/libexec/netdata/netdata-updater.sh" --not-running-from-cron ; then
packaging/installer/kickstart.sh
+1
-1
@@ -372,7 +372,7 @@ if [ -n "$ndpath" ] ; then
372
373
if [ -r "${ndprefix}/etc/netdata/.environment" ] ; then
374
ndstatic="$(grep IS_NETDATA_STATIC_BINARY "${ndprefix}/etc/netdata/.environment" | cut -d "=" -f 2 | tr -d \")"
375
- if [ -z "${NETDATA_REINSTALL}" ] ; then
375
+ if [ -z "${NETDATA_REINSTALL}" ] && [ -z "${NETDATA_LOCAL_TARBALL_OVERRIDE}" ] ; then
376
if [ -x "${ndprefix}/usr/libexec/netdata/netdata-updater.sh" ] ; then
377
progress "Attempting to update existing install instead of creating a new one"
378
if run ${sudo} "${ndprefix}/usr/libexec/netdata/netdata-updater.sh" --not-running-from-cron ; then
packaging/installer/methods/kickstart-64.md
+1
-1
@@ -78,7 +78,7 @@ To use `md5sum` to verify the intregity of the `kickstart-static64.sh` script yo
78
command above, run the following:
79
80
```bash
81
-[ "e06b4ecd791bc50c93d6c71839b53c41" = "$(curl -Ss https://my-netdata.io/kickstart-static64.sh | md5sum | cut -d ' ' -f 1)" ] && echo "OK, VALID" || echo "FAILED, INVALID"
81
+[ "4940607945b1b92db96d4674b5bba7b3" = "$(curl -Ss https://my-netdata.io/kickstart-static64.sh | md5sum | cut -d ' ' -f 1)" ] && echo "OK, VALID" || echo "FAILED, INVALID"
82
```
83
84
If the script is valid, this command will return `OK, VALID`.
packaging/installer/methods/kickstart.md
+1
-1
@@ -61,7 +61,7 @@ To use `md5sum` to verify the intregity of the `kickstart.sh` script you will do
61
run the following:
62
63
```bash
64
-[ "15420d0d5bd61fe4027c20d9276a696e" = "$(curl -Ss https://my-netdata.io/kickstart.sh | md5sum | cut -d ' ' -f 1)" ] && echo "OK, VALID" || echo "FAILED, INVALID"
64
+[ "e08dfbc39c23bf8993861e19c7d32368" = "$(curl -Ss https://my-netdata.io/kickstart.sh | md5sum | cut -d ' ' -f 1)" ] && echo "OK, VALID" || echo "FAILED, INVALID"
65
```
66
67
If the script is valid, this command will return `OK, VALID`.