Make a lack of an os-release file non-fatal on install. (#12087)
Instead just skip trying native packages and fall back properly to static builds or local builds. This was the intended behavior originally, it just never got implemented properly.
Austin S. Hemmelgarn committed
Feb 7, 2022 at 07:18 UTC
f9c53895baabe905739257e9760c71e9a921aa32
2 files changed
+31
-23
packaging/installer/kickstart.sh
+30
-22
@@ -399,34 +399,42 @@ get_system_info() {
399
elif [ -s "/usr/lib/os-release" ] && [ -r "/usr/lib/os-release" ]; then
400
os_release_file="/usr/lib/os-release"
401
else
402
- fatal "Cannot find an os-release file ..." F0401
402
+ warning "Cannot find an os-release file ..."
403
fi
404
405
- # shellcheck disable=SC1090
406
- . "${os_release_file}"
405
+ if [ -n "${os_release_file}" ]; then
406
+ # shellcheck disable=SC1090
407
+ . "${os_release_file}"
408
408
- DISTRO="${ID}"
409
- SYSVERSION="${VERSION_ID}"
410
- SYSCODENAME="${VERSION_CODENAME}"
411
- SYSARCH="$(uname -m)"
409
+ DISTRO="${ID}"
410
+ SYSVERSION="${VERSION_ID}"
411
+ SYSCODENAME="${VERSION_CODENAME}"
412
+ SYSARCH="$(uname -m)"
413
413
- supported_compat_names="debian ubuntu centos fedora opensuse"
414
+ supported_compat_names="debian ubuntu centos fedora opensuse"
415
415
- if str_in_list "${DISTRO}" "${supported_compat_names}"; then
416
- DISTRO_COMPAT_NAME="${DISTRO}"
416
+ if str_in_list "${DISTRO}" "${supported_compat_names}"; then
417
+ DISTRO_COMPAT_NAME="${DISTRO}"
418
+ else
419
+ case "${DISTRO}" in
420
+ opensuse-leap)
421
+ DISTRO_COMPAT_NAME="opensuse"
422
+ ;;
423
+ rocky|rhel)
424
+ DISTRO_COMPAT_NAME="centos"
425
+ SYSVERSION=$(echo "$SYSVERSION" | cut -d'.' -f1)
426
+ ;;
427
+ *)
428
+ DISTRO_COMPAT_NAME="unknown"
429
+ ;;
430
+ esac
431
+ fi
432
else
418
- case "${DISTRO}" in
419
- opensuse-leap)
420
- DISTRO_COMPAT_NAME="opensuse"
421
- ;;
422
- rocky|rhel)
423
- DISTRO_COMPAT_NAME="centos"
424
- SYSVERSION=$(echo "$SYSVERSION" | cut -d'.' -f1)
425
- ;;
426
- *)
427
- DISTRO_COMPAT_NAME="unknown"
428
- ;;
429
- esac
433
+ DISTRO="unknown"
434
+ DISTRO_COMPAT_NAME="unknown"
435
+ SYSVERSION="unknown"
436
+ SYSCODENAME="unknown"
437
+ SYSARCH="$(uname -m)"
438
fi
439
;;
440
Darwin)
packaging/installer/methods/kickstart.md
+1
-1
@@ -139,7 +139,7 @@ To use `md5sum` to verify the integrity of the `kickstart.sh` script you will do
139
run the following:
140
141
```bash
142
-[ "ec587c2196d71f90831cbe691545f92c" = "$(curl -Ss https://my-netdata.io/kickstart.sh | md5sum | cut -d ' ' -f 1)" ] && echo "OK, VALID" || echo "FAILED, INVALID"
142
+[ "42b5969be5d38ac696e21e444df72f86" = "$(curl -Ss https://my-netdata.io/kickstart.sh | md5sum | cut -d ' ' -f 1)" ] && echo "OK, VALID" || echo "FAILED, INVALID"
143
```
144
145
If the script is valid, this command will return `OK, VALID`.