mirror/librenms-librenms
1
0
Fork 0
mirror of https://github.com/librenms/librenms.git synced 2024-10-07 16:52:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

distro script: Consider /etc/os-release along with the distribution-specific files and allow /etc/lsb-release to override it

Browse Source
This commit is contained in:
Nils Steinger
2015-09-24 01:35:55 +02:00
parent 99b608ef48
commit c806d4cf60
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
scripts/distro
View File

@@ -43,6 +43,9 @@ elif [ "${OS}" = "Linux" ] ; then
IGNORE_LSB=1 # /etc/lsb-release would overwrite $REV with "rolling"
elif [ -f /etc/UnitedLinux-release ] ; then
DIST="${DIST}[`cat /etc/UnitedLinux-release | tr "\n" ' ' | sed s/VERSION.*//`]"
elif [ -f /etc/os-release ] ; then
DIST="$(grep '^NAME=' /etc/os-release | cut -d= -f2- | tr -d '\"')"
REV="$(grep '^VERSION_ID=' /etc/os-release | cut -d= -f2- | tr -d '\"')"
fi
if [ -f /etc/lsb-release -a "${IGNORE_LSB}" != 1 ] ; then
@@ -52,9 +55,6 @@ elif [ "${OS}" = "Linux" ] ; then
DIST=$LSB_DIST
REV=$LSB_REV
fi
elif [ -f /etc/os-release ] ; then
DIST="$(grep '^NAME=' /etc/os-release | cut -d= -f2- | tr -d '\"')"
REV="$(grep '^VERSION_ID=' /etc/os-release | cut -d= -f2- | tr -d '\"')"
fi
if [ -n "${REV}" ]