[cloudstack] 01/01: Merge branch '4.9' into 4.10

[ro...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

rohit pushed a commit to branch 4.10
in repository https://gitbox.apache.org/repos/asf/cloudstack.git

commit 922bf02b6308636715229639b45239d5a9d929b3
Merge: bb7d206 8daf634
Author: Rohit Yadav <ro...@shapeblue.com>
AuthorDate: Tue Jan 9 16:23:06 2018 +0530

    Merge branch '4.9' into 4.10
    
    Signed-off-by: Rohit Yadav <ro...@shapeblue.com>

 tools/appliance/definitions/systemvmtemplate/apt_upgrade.sh | 3 +++
 1 file changed, 3 insertions(+)

diff --cc tools/appliance/definitions/systemvmtemplate/apt_upgrade.sh
index f98c6b5,645d86d..c49ac47
--- a/tools/appliance/definitions/systemvmtemplate/apt_upgrade.sh
+++ b/tools/appliance/definitions/systemvmtemplate/apt_upgrade.sh
@@@ -20,10 -20,10 +20,12 @@@ set -
  set -x
  
  function add_backports() {
 +  sed -i '/cdrom/d' /etc/apt/sources.list
 +  sed -i '/deb-src/d' /etc/apt/sources.list
    sed -i '/backports/d' /etc/apt/sources.list
+   sed -i '/security/d' /etc/apt/sources.list
    echo 'deb http://http.debian.net/debian wheezy-backports main' >> /etc/apt/sources.list
+   echo 'deb http://security.debian.org/debian-security wheezy/updates main' >> /etc/apt/sources.list
  }
  
  function apt_upgrade() {
@@@ -32,13 -32,10 +34,14 @@@
  
    add_backports
  
 -  apt-get clean
 +  rm -fv /root/*.iso
 +  apt-get -y autoremove
 +  apt-get autoclean
    apt-get -q -y --force-yes update
    apt-get -q -y --force-yes upgrade
+   apt-get -q -y --force-yes dist-upgrade
 +
 +  df -h
  }
  
  return 2>/dev/null || apt_upgrade

-- 
To stop receiving notification emails like this one, please contact
"commits@cloudstack.apache.org" <co...@cloudstack.apache.org>.