diff --git a/cloud.spec b/cloud.spec index 386e0beea41..17b4e841868 100644 --- a/cloud.spec +++ b/cloud.spec @@ -302,6 +302,8 @@ Obsoletes: %{name}-premium-vendor-zynga < %{version}-%{release} Requires: java >= 1.6.0 Requires: %{name}-utils = %{version}-%{release} Requires: %{name}-premium-deps +# there is a fsimage.so in the source code, which adds xen-libs as a dependence, needs to supress it, as rhel doesn't have this pacakge +AutoReqProv: no License: CSL 1.1 Group: System Environment/Libraries %description premium diff --git a/patches/systemvm/debian/config/etc/init.d/cloud-early-config b/patches/systemvm/debian/config/etc/init.d/cloud-early-config index 34d54edcf59..e3f245e6c69 100755 --- a/patches/systemvm/debian/config/etc/init.d/cloud-early-config +++ b/patches/systemvm/debian/config/etc/init.d/cloud-early-config @@ -185,7 +185,7 @@ setup_common() { then ip route add default via $GW dev $3 else - ip route add default via $GW dev eth1 + ip route add default via $GW dev eth0 fi } diff --git a/wscript_configure b/wscript_configure index 6bed5734ada..6a8f866034b 100644 --- a/wscript_configure +++ b/wscript_configure @@ -37,6 +37,12 @@ systemjars = { "tomcat6-jsp-2.1-api-6.0.26.jar", #"tomcat6/catalina.jar", # all supported distros put the file there ), + 'RHEL6': + ( + "tomcat6-servlet-2.5-api.jar", + "tomcat6-el-2.1-api-6.0.24.jar", + "tomcat6-jsp-2.1-api-6.0.24.jar", + ), 'CentOS': ( "tomcat6-servlet-2.5-api.jar", @@ -100,12 +106,17 @@ if Options.platform == 'win32': conf.env.DISTRO = "Windows" elif Options.platform == 'darwin': conf.env.DISTRO = "Mac" elif _exists("/etc/network"): conf.env.DISTRO = "Ubuntu" elif _exists("/etc/fedora-release"): conf.env.DISTRO = "Fedora" -elif _exists("/etc/centos-release") or _exists("/etc/redhat-release"): conf.env.DISTRO = "CentOS" +elif _exists("/etc/centos-release"): conf.env.DISTRO = "CentOS" +elif _exists("/etc/redhat-release"): + version = file("/etc/redhat-release").readline() + if version.find("Red Hat Enterprise Linux Server release 6") != -1: + conf.env.DISTRO = RHEL6 + elif version.find("Centos release") != -1: + conf.env.DISTRO = CentOS else: conf.env.DISTRO = "unknown" if conf.env.DISTRO == "unknown": c = "YELLOW" else: c = "GREEN" conf.check_message_2(conf.env.DISTRO,c) - conf.check_message_1('Detecting installation prefix') if Options.options.prefix == Options.default_prefix: if conf.env.DISTRO == 'Windows':