diff options
| author | Austin S. Hemmelgarn <austin@netdata.cloud> | 2023-03-03 08:01:02 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-03-03 15:01:02 +0200 |
| commit | 0a3a480a980894b051a7d282241922fdaed45c20 (patch) | |
| tree | bb71ae4d49676e297defb5fd25e89f08a415b6c5 /packaging | |
| parent | af74a98ea0bc28f16b437e3769729d60d6517690 (diff) | |
Fix handling of missing release codename on DEB systems. (#14642)
Instead of treating it as a fatal error, just warn about it and skip
native packages.
Also fixes a long unnoticed bug in the early fallback case for native
packages.
Diffstat (limited to 'packaging')
| -rwxr-xr-x | packaging/installer/kickstart.sh | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/packaging/installer/kickstart.sh b/packaging/installer/kickstart.sh index 38ad91172c..4064d598cd 100755 --- a/packaging/installer/kickstart.sh +++ b/packaging/installer/kickstart.sh @@ -692,11 +692,6 @@ get_system_info() { centos|ol) SYSVERSION=$(echo "$SYSVERSION" | cut -d'.' -f1) ;; - ubuntu|debian) - if [ -z "${SYSCODENAME}" ]; then - fatal "Could not determine ${DISTRO} release code name. This is required information on these systems." F0511 - fi - ;; esac ;; Darwin) @@ -1360,9 +1355,16 @@ check_special_native_deps() { try_package_install() { failed_refresh_msg="Failed to refresh repository metadata. ${BADNET_MSG} or by misconfiguration of one or more rpackage repositories in the system package manager configuration." - if [ -z "${DISTRO}" ] || [ "${DISTRO}" = "unknown" ]; then + if [ -z "${DISTRO_COMPAT_NAME}" ] || [ "${DISTRO_COMPAT_NAME}" = "unknown" ]; then warning "Unable to determine Linux distribution for native packages." return 2 + elif [ -z "${SYSCODENAME}" ]; then + case "${DISTRO_COMPAT_NAME}" in + debian|ubuntu) + warning "Release codename not set. Unable to check availability of native packages for this system." + return 2 + ;; + esac fi set_tmpdir |