tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

2013-03-25 Hirofumi Kosaka <kosaka@rworks.jp> 

* pandora_console_install: 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@7885 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
hkosaka 2013-03-25 05:51:11 +00:00
parent 5ed338ddc2
commit bb3a017e4a
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pandora_console/ChangeLog
View File

@ -1,3 +1,9 @@
2013-03-25 Hirofumi Kosaka <kosaka@rworks.jp>
* pandora_console_install: Fixed false recognition of RHEL6.4
(it had been recoginzed as Ubuntu incorrecty because of its
"/etc/lsb-release").
2013-03-25 Junichi Satoh <junichi@rworks.jp>
* include/help/ja/help_manage_alert_list.php: Added description for

2
pandora_console/pandora_console_install
View File

@ -25,7 +25,7 @@ get_distro () {
OS_VERSION=`cat /etc/SuSE-release | grep VERSION | cut -f 3 -d " "`
LINUX_DISTRO=SUSE
else
if [ -f "/etc/lsb-release" ]
if [ -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