From c17f9fd97d4d93faa50b7fb711ae55a643784cce Mon Sep 17 00:00:00 2001 From: hkosaka Date: Mon, 25 Mar 2013 05:55:18 +0000 Subject: [PATCH] 2013-03-25 Hirofumi Kosaka * pandora_server_installer: Fixed false recognition of RHEL6.4. (it had been recoginzed as Ubuntu incorrecty because of its "/etc/lsb-release"). git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7886 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f --- pandora_server/ChangeLog | 6 ++++++ pandora_server/pandora_server_installer | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/pandora_server/ChangeLog b/pandora_server/ChangeLog index ba57613ccd..80832c14cb 100644 --- a/pandora_server/ChangeLog +++ b/pandora_server/ChangeLog @@ -1,3 +1,9 @@ +2013-03-25 Hirofumi Kosaka + + * pandora_server_installer: Fixed false recognition of RHEL6.4. + (it had been recoginzed as Ubuntu incorrecty because of its + "/etc/lsb-release"). + 2013-03-20 Ramon Novoa * conf/pandora_server.conf, diff --git a/pandora_server/pandora_server_installer b/pandora_server/pandora_server_installer index dc920932ee..bc150c4b88 100755 --- a/pandora_server/pandora_server_installer +++ b/pandora_server/pandora_server_installer @@ -28,7 +28,7 @@ get_distro () { then OS_VERSION=`cat /etc/SuSE-release | grep VERSION | cut -f 3 -d " "` LINUX_DISTRO=SUSE - elif [ -f "/etc/lsb-release" ] + elif [ -f "/etc/lsb-release" ] && [ ! -f "/etc/redhat-release" ] then OS_VERSION=`cat /etc/lsb-release | grep DISTRIB_RELEASE | cut -f 2 -d "="` LINUX_DISTRO=UBUNTU