apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-10-26 08:42:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

Have cloud-setup-* tools detect Debian

Browse Source 
To minimize this change, treat Debian as Ubuntu for now.

Reviewed-by: Wido (https://reviews.apache.org/r/9310)
This commit is contained in:
Noa Resare 2013-01-12 20:34:32 +00:00 committed by Rohit Yadav
parent a4398af353
commit fe9df2186b
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
debian/control vendored
View File

@ -48,7 +48,7 @@ Description: CloudStack server library
Package: cloud-scripts Package: cloud-scripts
Replaces: cloud-agent-scripts Replaces: cloud-agent-scripts
Architecture: any Architecture: any
Depends: openjdk-6-jre, python, bash, bzip2, gzip, unzip, nfs-common, openssh-client Depends: openjdk-6-jre, python, bash, bzip2, gzip, unzip, nfs-common, openssh-client, lsb-release
Description: CloudStack scripts Description: CloudStack scripts
This package contains a number of scripts needed for the CloudStack Agent and Management Server. This package contains a number of scripts needed for the CloudStack Agent and Management Server.
Both the CloudStack Agent and Management server depend on this package Both the CloudStack Agent and Management server depend on this package

9
python/lib/cloudutils/utilities.py
View File

@ -122,7 +122,14 @@ class Distribution:
if kernel.find("2.6.32") != -1: if kernel.find("2.6.32") != -1:
self.release = "10.04" self.release = "10.04"
self.arch = bash("uname -m").getStdout() self.arch = bash("uname -m").getStdout()
elif os.path.exists("/usr/bin/lsb_release"):
o = bash("/usr/bin/lsb_release -i")
distributor = o.getStdout().split(":\t")[1]
if "Debian" in distributor:
# This obviously needs a rewrite at some point
self.distro = "Ubuntu"
else:
raise UnknownSystemException(distributor)
else: else:
raise UnknownSystemException raise UnknownSystemException