diff options
| author | Michael Boelen <michael.boelen@cisofy.com> | 2020-10-20 14:11:54 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-10-20 14:11:54 +0300 |
| commit | 3dd8fba196657e6e9ca1ae3ee5b1ece5089a25f9 (patch) | |
| tree | 4ca2a358b2ca66cc78249d4e5c4aefaa803a67c4 /include/osdetection | |
| parent | 77b93ae73df0de716f7dd56f85a8c51406607a54 (diff) | |
| parent | 68e8ef862e4da525efc1b157e74e8789a50b32e8 (diff) | |
Merge pull request #1043 from konstruktoid/mageia
Mageia got /etc/os-release and add Mageia EOL dates
Diffstat (limited to 'include/osdetection')
| -rw-r--r-- | include/osdetection | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/include/osdetection b/include/osdetection index eac5eadf..89455e0f 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" @@ -407,13 +413,6 @@ LINUX_VERSION="Fedora" fi - # Mageia (has also /etc/megaia-release) - FIND=$(grep "Mageia" /etc/redhat-release) - if [ ! "${FIND}" = "" ]; then - OS_FULLNAME=$(grep "^Mageia" /etc/redhat-release) - OS_VERSION=$(grep "^Mageia" /etc/redhat-release | awk '{ if ($2=="release") { print $3 } }') - LINUX_VERSION="Mageia" - fi # Oracle Enterprise Linux FIND=$(grep "Enterprise Linux Enterprise Linux Server" /etc/redhat-release) |