From f0ded6c2a3408d361145952234bfcd306eae0d23 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20Sj=C3=B6gren?= Date: Mon, 19 Oct 2020 12:07:16 +0200 Subject: [PATCH 1/2] add Mageia EOL dates and grep /etc/mageia-release MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Thomas Sjögren --- db/software-eol.db | 10 ++++++++++ include/osdetection | 8 ++++---- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/db/software-eol.db b/db/software-eol.db index 2412a203..ea7d5888 100644 --- a/db/software-eol.db +++ b/db/software-eol.db @@ -68,6 +68,16 @@ os:Linux Mint 18:2021-04-01:1617228000: os:Linux Mint 19:2023-04-01:1680300000: os:Linux Mint 20:2025-04-01:1743458400: # +# Mageia - https://www.mageia.org/en/support/ +# +os:Mageia 1:2012-12-01:1354316400 +os:Mageia 2:2013-11-22:1385074800 +os:Mageia 3:2014-11-26:1416956400 +os:Mageia 4:2015-09-19:1442613600 +os:Mageia 5:2017-12-31:1514674800 +os:Mageia 6:2019-09-30:1569794400 +os:Mageia 7:2020-12-30:1609282800 +# # NetBSD - https://www.netbsd.org/support/security/release.html and # https://www.netbsd.org/releases/formal.html # diff --git a/include/osdetection b/include/osdetection index 5aa5878b..441ef6bd 100644 --- a/include/osdetection +++ b/include/osdetection @@ -396,11 +396,11 @@ LINUX_VERSION="Fedora" fi - # Mageia (has also /etc/megaia-release) - FIND=$(grep "Mageia" /etc/redhat-release) + # Mageia (/etc/redhat-release -> /etc/mageia-release link) + FIND=$(grep "Mageia" /etc/mageia-release) if [ ! "${FIND}" = "" ]; then - OS_FULLNAME=$(grep "^Mageia" /etc/redhat-release) - OS_VERSION=$(grep "^Mageia" /etc/redhat-release | awk '{ if ($2=="release") { print $3 } }') + OS_FULLNAME=$(grep "^Mageia" /etc/mageia-release) + OS_VERSION=$(grep "^Mageia" /etc/mageia-release | awk '{ if ($2=="release") { print $3 } }') LINUX_VERSION="Mageia" fi From 68e8ef862e4da525efc1b157e74e8789a50b32e8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20Sj=C3=B6gren?= Date: Mon, 19 Oct 2020 12:38:59 +0200 Subject: [PATCH 2/2] mageia got /etc/os-release MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Thomas Sjögren --- include/osdetection | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/include/osdetection b/include/osdetection index 441ef6bd..34667ca8 100644 --- a/include/osdetection +++ b/include/osdetection @@ -212,6 +212,12 @@ OS_VERSION=$(grep "^VERSION_ID=" /etc/os-release | awk -F= '{print $2}' | tr -d '"') OS_VERSION_FULL=$(grep "^VERSION=" /etc/os-release | awk -F= '{print $2}' | tr -d '"') ;; + "mageia") + LINUX_VERSION="Mageia" + OS_NAME="Mageia" + OS_VERSION=$(grep "^VERSION_ID=" /etc/os-release | awk -F= '{print $2}' | tr -d '"') + OS_VERSION_FULL=$(grep "^VERSION=" /etc/os-release | awk -F= '{print $2}' | tr -d '"') + ;; "manjaro") LINUX_VERSION="Manjaro" OS_FULLNAME="Manjaro Linux" @@ -396,13 +402,6 @@ LINUX_VERSION="Fedora" fi - # Mageia (/etc/redhat-release -> /etc/mageia-release link) - FIND=$(grep "Mageia" /etc/mageia-release) - if [ ! "${FIND}" = "" ]; then - OS_FULLNAME=$(grep "^Mageia" /etc/mageia-release) - OS_VERSION=$(grep "^Mageia" /etc/mageia-release | awk '{ if ($2=="release") { print $3 } }') - LINUX_VERSION="Mageia" - fi # Oracle Enterprise Linux FIND=$(grep "Enterprise Linux Enterprise Linux Server" /etc/redhat-release)