From 1543f63467886cf1009e91f8dfd070e0c19f848d Mon Sep 17 00:00:00 2001 From: Nils Steinger Date: Thu, 24 Sep 2015 01:25:24 +0200 Subject: [PATCH] Revert "distro script: Only parse /etc/lsb-release if no known distribution is found" This reverts commit d048e5e616a3d50efbc1c41d2fdd926c08dd2ad2. The detection logic for Ubuntu (and perhaps other distributions) relies on /etc/lsb-release. --- scripts/distro | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/scripts/distro b/scripts/distro index abe1fd54e..752c22e9a 100755 --- a/scripts/distro +++ b/scripts/distro @@ -42,7 +42,9 @@ elif [ "${OS}" = "Linux" ] ; then REV="" # Omit version since Arch Linux uses rolling releases elif [ -f /etc/UnitedLinux-release ] ; then DIST="${DIST}[`cat /etc/UnitedLinux-release | tr "\n" ' ' | sed s/VERSION.*//`]" - elif [ -f /etc/lsb-release ] ; then + fi + + if [ -f /etc/lsb-release ] ; then LSB_DIST="`cat /etc/lsb-release | grep DISTRIB_ID | cut -d "=" -f2`" LSB_REV="`cat /etc/lsb-release | grep DISTRIB_RELEASE | cut -d "=" -f2`" if [ "$LSB_DIST" != "" ] ; then