Merge pull request #360 from xcp-ng/rocky-alma

Identify Rocky and Alma
stanislav-tkach · Feb 22, 2024 · 6a43b42 · 6a43b42
2 parents aa4fe9e + 2cfaf55
commit 6a43b42
Show file tree

Hide file tree

Showing 5 changed files with 68 additions and 4 deletions.
diff --git a/os_info/src/linux/file_release.rs b/os_info/src/linux/file_release.rs
@@ -89,8 +89,7 @@ static DISTRIBUTIONS: [ReleaseInfo; 6] = [
                 .and_then(|id| match id.as_str() {
                     // os-release information collected from
                     // https://github.com/chef/os_release
-
-                    //"almalinux" => Alma
+                    "almalinux" => Some(Type::AlmaLinux),
                     "alpaquita" => Some(Type::Alpaquita),
                     "alpine" => Some(Type::Alpine),
                     "amzn" => Some(Type::Amazon),
@@ -127,7 +126,7 @@ static DISTRIBUTIONS: [ReleaseInfo; 6] = [
                     //"raspbian" => Raspbian
                     // note XBian also uses "raspbian"
                     "rhel" => Some(Type::RedHatEnterprise),
-                    //"rocky" => Rocky
+                    "rocky" => Some(Type::RockyLinux),
                     //"sabayon" => Sabayon
                     //"scientific" => Scientific
                     //"slackware" => Slackware
@@ -201,6 +200,17 @@ mod tests {
     use super::*;
     use pretty_assertions::assert_eq;
 
+    #[test]
+    fn almalinux_9_0_release() {
+        let root = "src/linux/tests/AlmaLinux-9.0";
+
+        let info = retrieve(&DISTRIBUTIONS, root).unwrap();
+        assert_eq!(info.os_type(), Type::AlmaLinux);
+        assert_eq!(info.version, Version::Semantic(9, 0, 0));
+        assert_eq!(info.edition, None);
+        assert_eq!(info.codename, None);
+    }
+
     #[test]
     fn alpaquita_os_release() {
         let root = "src/linux/tests/Alpaquita";
@@ -558,6 +568,17 @@ mod tests {
         assert_eq!(info.codename, None);
     }
 
+    #[test]
+    fn rocky_9_2_release() {
+        let root = "src/linux/tests/RockyLinux-9.2";
+
+        let info = retrieve(&DISTRIBUTIONS, root).unwrap();
+        assert_eq!(info.os_type(), Type::RockyLinux);
+        assert_eq!(info.version, Version::Semantic(9, 2, 0));
+        assert_eq!(info.edition, None);
+        assert_eq!(info.codename, None);
+    }
+
     #[test]
     fn suse_12_os_release() {
         let root = "src/linux/tests/SUSE_12";

diff --git a/os_info/src/linux/mod.rs b/os_info/src/linux/mod.rs
@@ -26,7 +26,8 @@ mod tests {
     fn os_type() {
         let version = current_platform();
         match version.os_type() {
-            Type::Alpaquita
+            Type::AlmaLinux
+            | Type::Alpaquita
             | Type::Alpine
             | Type::Amazon
             | Type::Arch
@@ -51,6 +52,7 @@ mod tests {
             | Type::Raspbian
             | Type::Redhat
             | Type::RedHatEnterprise
+            | Type::RockyLinux
             | Type::Solus
             | Type::SUSE
             | Type::Ubuntu

diff --git a/os_info/src/linux/tests/AlmaLinux-9.0/etc/os-release b/os_info/src/linux/tests/AlmaLinux-9.0/etc/os-release
@@ -0,0 +1,18 @@
+NAME="AlmaLinux"
+VERSION="9.0 (Emerald Puma)"
+ID="almalinux"
+ID_LIKE="rhel centos fedora"
+VERSION_ID="9.0"
+PLATFORM_ID="platform:el9"
+PRETTY_NAME="AlmaLinux 9.0 (Emerald Puma)"
+ANSI_COLOR="0;34"
+LOGO="fedora-logo-icon"
+CPE_NAME="cpe:/o:almalinux:almalinux:9::baseos"
+HOME_URL="https://almalinux.org/"
+DOCUMENTATION_URL="https://wiki.almalinux.org/"
+BUG_REPORT_URL="https://bugs.almalinux.org/"
+
+ALMALINUX_MANTISBT_PROJECT="AlmaLinux-9"
+ALMALINUX_MANTISBT_PROJECT_VERSION="9.0"
+REDHAT_SUPPORT_PRODUCT="AlmaLinux"
+REDHAT_SUPPORT_PRODUCT_VERSION="9.0"
diff --git a/os_info/src/linux/tests/RockyLinux-9.2/etc/os-release b/os_info/src/linux/tests/RockyLinux-9.2/etc/os-release
@@ -0,0 +1,17 @@
+NAME="Rocky Linux"
+VERSION="9.2 (Blue Onyx)"
+ID="rocky"
+ID_LIKE="rhel centos fedora"
+VERSION_ID="9.2"
+PLATFORM_ID="platform:el9"
+PRETTY_NAME="Rocky Linux 9.2 (Blue Onyx)"
+ANSI_COLOR="0;32"
+LOGO="fedora-logo-icon"
+CPE_NAME="cpe:/o:rocky:rocky:9::baseos"
+HOME_URL="https://rockylinux.org/"
+BUG_REPORT_URL="https://bugs.rockylinux.org/"
+SUPPORT_END="2032-05-31"
+ROCKY_SUPPORT_PRODUCT="Rocky-Linux-9"
+ROCKY_SUPPORT_PRODUCT_VERSION="9.2"
+REDHAT_SUPPORT_PRODUCT="Rocky Linux"
+REDHAT_SUPPORT_PRODUCT_VERSION="9.2"
diff --git a/os_info/src/os_type.rs b/os_info/src/os_type.rs
@@ -8,6 +8,8 @@ use std::fmt::{self, Display, Formatter};
 pub enum Type {
     /// IBM AIX (<https://en.wikipedia.org/wiki/IBM_AIX>).
     AIX,
+    /// AlmaLinux (<https://en.wikipedia.org/wiki/AlmaLinux>).
+    AlmaLinux,
     /// Alpaquita Linux (<https://bell-sw.com/alpaquita-linux/>).
     Alpaquita,
     /// Alpine Linux (<https://en.wikipedia.org/wiki/Alpine_Linux>).
@@ -82,6 +84,8 @@ pub enum Type {
     RedHatEnterprise,
     /// Redox (<https://en.wikipedia.org/wiki/Redox_(operating_system)>).
     Redox,
+    /// Rocky Linux (<https://en.wikipedia.org/wiki/Rocky_Linux>).
+    RockyLinux,
     /// Solus (<https://en.wikipedia.org/wiki/Solus_(operating_system)>).
     Solus,
     /// SUSE Linux Enterprise Server (<https://en.wikipedia.org/wiki/SUSE_Linux_Enterprise>).
@@ -105,6 +109,7 @@ impl Display for Type {
         match *self {
             Type::Alpaquita => write!(f, "Alpaquita Linux"),
             Type::Alpine => write!(f, "Alpine Linux"),
+            Type::AlmaLinux => write!(f, "AlmaLinux"),
             Type::Amazon => write!(f, "Amazon Linux AMI"),
             Type::Arch => write!(f, "Arch Linux"),
             Type::Artix => write!(f, "Artix Linux"),
@@ -120,6 +125,7 @@ impl Display for Type {
             Type::Raspbian => write!(f, "Raspberry Pi OS"),
             Type::Redhat => write!(f, "Red Hat Linux"),
             Type::RedHatEnterprise => write!(f, "Red Hat Enterprise Linux"),
+            Type::RockyLinux => write!(f, "Rocky Linux"),
             Type::SUSE => write!(f, "SUSE Linux Enterprise Server"),
             _ => write!(f, "{self:?}"),
         }