You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by we...@apache.org on 2013/06/10 19:27:16 UTC
[22/50] [abbrv] git commit: updated refs/heads/disk_io_throttling to
8b8a0d3
Debian repository (backports) now has latest haproxy, re-introduce into systemvm
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/cb80ae24
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/cb80ae24
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/cb80ae24
Branch: refs/heads/disk_io_throttling
Commit: cb80ae2440aec8586cb34834cc3939d93a12beea
Parents: 8c9f681
Author: Chiradeep Vittal <ch...@apache.org>
Authored: Fri Jun 7 17:28:53 2013 -0700
Committer: Chiradeep Vittal <ch...@apache.org>
Committed: Fri Jun 7 17:29:14 2013 -0700
----------------------------------------------------------------------
.../definitions/systemvmtemplate/postinstall.sh | 13 +++++++++----
.../definitions/systemvmtemplate64/postinstall.sh | 15 +++++++++++----
2 files changed, 20 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/cb80ae24/tools/appliance/definitions/systemvmtemplate/postinstall.sh
----------------------------------------------------------------------
diff --git a/tools/appliance/definitions/systemvmtemplate/postinstall.sh b/tools/appliance/definitions/systemvmtemplate/postinstall.sh
index e052cf9..203cf54 100644
--- a/tools/appliance/definitions/systemvmtemplate/postinstall.sh
+++ b/tools/appliance/definitions/systemvmtemplate/postinstall.sh
@@ -21,6 +21,12 @@ ROOTPW=password
HOSTNAME=systemvm
CLOUDSTACK_RELEASE=4.2.0
+add_backports () {
+ sed -i '/backports/d' /etc/apt/sources.list
+ echo 'deb http://http.us.debian.org/debian wheezy-backports main' >> /etc/apt/sources.list
+ apt-get update
+}
+
install_packages() {
DEBIAN_FRONTEND=noninteractive
DEBIAN_PRIORITY=critical
@@ -81,10 +87,7 @@ install_packages() {
# rm -fr /opt/vmware-tools-distrib
# apt-get -q -y --force-yes purge build-essential
- # haproxy. Wheezy doesn't have haproxy, install from backports
- #apt-get --no-install-recommends -q -y --force-yes install haproxy
- wget http://ftp.us.debian.org/debian/pool/main/h/haproxy/haproxy_1.4.8-1_i386.deb
- dpkg -i haproxy_1.4.8-1_i386.deb
+ apt-get --no-install-recommends -q -y --force-yes install haproxy
}
setup_accounts() {
@@ -223,6 +226,8 @@ do_signature() {
begin=$(date +%s)
+echo "*************ADDING BACKPORTS********************"
+add_backports
echo "*************INSTALLING PACKAGES********************"
install_packages
echo "*************DONE INSTALLING PACKAGES********************"
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/cb80ae24/tools/appliance/definitions/systemvmtemplate64/postinstall.sh
----------------------------------------------------------------------
diff --git a/tools/appliance/definitions/systemvmtemplate64/postinstall.sh b/tools/appliance/definitions/systemvmtemplate64/postinstall.sh
index 786d38d..cbcd282 100644
--- a/tools/appliance/definitions/systemvmtemplate64/postinstall.sh
+++ b/tools/appliance/definitions/systemvmtemplate64/postinstall.sh
@@ -21,6 +21,13 @@ ROOTPW=password
HOSTNAME=systemvm
CLOUDSTACK_RELEASE=4.2.0
+add_backports () {
+ sed -i '/backports/d' /etc/apt/sources.list
+ echo 'deb http://http.us.debian.org/debian wheezy-backports main' >> /etc/apt/sources.list
+ apt-get update
+}
+
+
install_packages() {
DEBIAN_FRONTEND=noninteractive
DEBIAN_PRIORITY=critical
@@ -80,10 +87,8 @@ install_packages() {
# rm -fr /opt/vmware-tools-distrib
# apt-get -q -y --force-yes purge build-essential
- # haproxy. Wheezy doesn't have haproxy temporarily, install from backports
- #apt-get --no-install-recommends -q -y --force-yes install haproxy
- wget http://ftp.us.debian.org/debian/pool/main/h/haproxy/haproxy_1.4.8-1_amd64.deb
- dpkg -i haproxy_1.4.8-1_amd64.deb
+ apt-get --no-install-recommends -q -y --force-yes install haproxy
+
}
setup_accounts() {
@@ -222,6 +227,8 @@ do_signature() {
begin=$(date +%s)
+echo "*************ADDING BACKPORTS********************"
+add_backports
echo "*************INSTALLING PACKAGES********************"
install_packages
echo "*************DONE INSTALLING PACKAGES********************"