distr_info: use major version only for RHEL compat distros

1433da02 · Vitaly Lipatov · 522c423b · 1433da02 · 1433da02 · 1433da02
Commit 1433da02 authored Oct 07, 2024 by Vitaly Lipatov
Show whitespace changes
Inline Side-by-side

Showing with 8 additions and 3 deletions

distr_info bin/distr_info +5 -0

etalon.txt tests/etc/MSVSphere/etalon.txt +1 -1

etalon.txt tests/etc/RHEL/etalon.txt +1 -1

etalon.txt tests/etc/ROSA/etalon.txt +1 -1

No files found.
--- a/bin/distr_info
+++ b/bin/distr_info
@@ -412,6 +412,11 @@ if distro os-release ; then
            fi
            ;;
    esac
+    case "$VENDOR_ID" in
+        reld|rhel|msvsphere|alteros|rockylinux|almalinux)
+            DISTRIB_RELEASE=$(normalize_version1 "$DISTRIB_RELEASE")
+            ;;
+    esac
    DISTRIB_FULL_RELEASE="$DISTRIB_RELEASE"
    DISTRIB_CODENAME="$VERSION_CODENAME"


--- a/tests/etc/MSVSphere/etalon.txt
+++ b/tests/etc/MSVSphere/etalon.txt
-MSVSphere/9.3 msvsphere/9.3
+MSVSphere/9 msvsphere/9
--- a/tests/etc/RHEL/etalon.txt
+++ b/tests/etc/RHEL/etalon.txt
-RHEL/7.9 rhel/7.9
+RHEL/7 rhel/7
--- a/tests/etc/ROSA/etalon.txt
+++ b/tests/etc/ROSA/etalon.txt
-RELS/7.9 reld/7.9
+RELS/7 reld/7