This repository was archived by the owner on Jan 15, 2020. It is now read-only.
Commit fe9df21
Have cloud-setup-* tools detect Debian
To minimize this change, treat Debian as Ubuntu for now.
Reviewed-by: Wido (https://reviews.apache.org/r/9310)1 parent a4398af commit fe9df21
2 files changed
Lines changed: 9 additions & 2 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -48,7 +48,7 @@ Description: CloudStack server library | |||
| 48 | 48 | Package: cloud-scripts | |
| 49 | 49 | Replaces: cloud-agent-scripts | |
| 50 | 50 | Architecture: any | |
| 51 | - Depends: openjdk-6-jre, python, bash, bzip2, gzip, unzip, nfs-common, openssh-client | ||
| 51 | + Depends: openjdk-6-jre, python, bash, bzip2, gzip, unzip, nfs-common, openssh-client, lsb-release | ||
| 52 | 52 | Description: CloudStack scripts | |
| 53 | 53 | This package contains a number of scripts needed for the CloudStack Agent and Management Server. | |
| 54 | 54 | Both the CloudStack Agent and Management server depend on this package | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -122,7 +122,14 @@ def __init__(self): | |||
| 122 | 122 | if kernel.find("2.6.32") != -1: | |
| 123 | 123 | self.release = "10.04" | |
| 124 | 124 | self.arch = bash("uname -m").getStdout() | |
| 125 | - | ||
| 125 | + elif os.path.exists("/usr/bin/lsb_release"): | ||
| 126 | + o = bash("/usr/bin/lsb_release -i") | ||
| 127 | + distributor = o.getStdout().split(":\t")[1] | ||
| 128 | + if "Debian" in distributor: | ||
| 129 | + # This obviously needs a rewrite at some point | ||
| 130 | + self.distro = "Ubuntu" | ||
| 131 | + else: | ||
| 132 | + raise UnknownSystemException(distributor) | ||
| 126 | 133 | else: | |
| 127 | 134 | raise UnknownSystemException | |
| 128 | 135 | ||
0 commit comments