From 6641fd3a76eb59cbc8cf73a645351e0fe6211289 Mon Sep 17 00:00:00 2001
From: Leo Simons <lsimons@schubergphilis.com>
Date: Mon, 21 Jul 2014 10:57:32 +0200
Subject: [PATCH] CLOUDSTACK-7143: move add_backports to apt_upgrade.sh

---
 .../appliance/definitions/systemvmtemplate/apt_upgrade.sh | 7 +++++++
 .../appliance/definitions/systemvmtemplate/postinstall.sh | 8 --------
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/tools/appliance/definitions/systemvmtemplate/apt_upgrade.sh b/tools/appliance/definitions/systemvmtemplate/apt_upgrade.sh
index 69acc1a9c6b..6d38a24a739 100644
--- a/tools/appliance/definitions/systemvmtemplate/apt_upgrade.sh
+++ b/tools/appliance/definitions/systemvmtemplate/apt_upgrade.sh
@@ -3,6 +3,13 @@
 export DEBIAN_FRONTEND=noninteractive
 export DEBIAN_PRIORITY=critical
 
+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
+}
+
+add_backports
+
 apt-get -q -y --force-yes update
 apt-get -q -y --force-yes install curl unzip
 apt-get clean
diff --git a/tools/appliance/definitions/systemvmtemplate/postinstall.sh b/tools/appliance/definitions/systemvmtemplate/postinstall.sh
index e00d259ec8a..1cf60869ff9 100644
--- a/tools/appliance/definitions/systemvmtemplate/postinstall.sh
+++ b/tools/appliance/definitions/systemvmtemplate/postinstall.sh
@@ -21,12 +21,6 @@ ROOTPW=password
 HOSTNAME=systemvm
 CLOUDSTACK_RELEASE=4.5.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
@@ -280,8 +274,6 @@ do_signature() {
 
 begin=$(date +%s)
 
-echo "*************ADDING BACKPORTS********************"
-add_backports
 echo "*************INSTALLING PACKAGES********************"
 install_packages
 echo "*************DONE INSTALLING PACKAGES********************"