F #-: Support ID_LIKE in /etc/os-release if it exists

Useful for unsupported distributions based off supported distributions Signed-off-by: Cody Robertson <[email protected]>
OpenNebula · Apr 26, 2023 · 610badf · 610badf
1 parent 0af6e4a
commit 610badf
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 27 deletions.
diff --git a/src/etc/one-context.d/loc-10-network b/src/etc/one-context.d/loc-10-network
@@ -29,32 +29,35 @@ if [ -z "${action}" ] ; then
 fi
 
 if [ -z "${NETCFG_TYPE}" ] ; then
-    case "${os_id}" in
-        alpine)
-            NETCFG_TYPE='interfaces'
-            ;;
-        altlinux)
-            NETCFG_TYPE='networkd nm'
-            ;;
-        debian|devuan|ubuntu)
-            NETCFG_TYPE='interfaces netplan nm networkd'
-            ;;
-        fedora|centos|rhel|almalinux|ol|rocky)
-            NETCFG_TYPE='scripts nm networkd'
-            ;;
-        opensuse*|sles|sled)
-            NETCFG_TYPE='scripts'
-            ;;
-        amzn)
-            NETCFG_TYPE='scripts'
-            ;;
-        freebsd)
-            NETCFG_TYPE='bsd'
-            ;;
-        *)
-            NETCFG_TYPE='none'
-            ;;
-    esac
+    for id in ${os_id}; do
+        case "${id}" in
+            alpine)
+                NETCFG_TYPE='interfaces'
+                ;;
+            altlinux)
+                NETCFG_TYPE='networkd nm'
+                ;;
+            debian|devuan|ubuntu)
+                NETCFG_TYPE='interfaces netplan nm networkd'
+                ;;
+            fedora|centos|rhel|almalinux|ol|rocky)
+                NETCFG_TYPE='scripts nm networkd'
+                ;;
+            opensuse*|sles|sled)
+                NETCFG_TYPE='scripts'
+                ;;
+            amzn)
+                NETCFG_TYPE='scripts'
+                ;;
+            freebsd)
+                NETCFG_TYPE='bsd'
+                ;;
+            *)
+                NETCFG_TYPE='none'
+                ;;
+        esac
+        break
+    done
 else
     # trim and lowercase
     NETCFG_TYPE=$(echo "$NETCFG_TYPE" | \

diff --git a/src/etc/one-context.d/loc-10-network.d/functions b/src/etc/one-context.d/loc-10-network.d/functions
@@ -198,9 +198,10 @@ detect_os()
 (
     if [ -f /etc/os-release ] ; then
         ID=
+        ID_LIKE=
         # shellcheck disable=SC1091
         . /etc/os-release
-        echo "$ID" | tr '[:upper:]' '[:lower:]'
+        echo "$ID $ID_LIKE" | tr '[:upper:]' '[:lower:]'
 
     # check for legacy RHEL/CentOS 6
     elif [ -f /etc/centos-release ]; then