From cb80ae2440aec8586cb34834cc3939d93a12beea Mon Sep 17 00:00:00 2001
From: Chiradeep Vittal <chiradeep@apache.org>
Date: Fri, 7 Jun 2013 17:28:53 -0700
Subject: [PATCH] Debian repository (backports) now has latest haproxy,
 re-introduce into systemvm

---
 .../definitions/systemvmtemplate/postinstall.sh   | 13 +++++++++----
 .../definitions/systemvmtemplate64/postinstall.sh | 15 +++++++++++----
 2 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/tools/appliance/definitions/systemvmtemplate/postinstall.sh b/tools/appliance/definitions/systemvmtemplate/postinstall.sh
index e052cf9c1c3..203cf54d827 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********************"
diff --git a/tools/appliance/definitions/systemvmtemplate64/postinstall.sh b/tools/appliance/definitions/systemvmtemplate64/postinstall.sh
index 786d38d4ef0..cbcd282b62e 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********************"