You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by bh...@apache.org on 2015/01/28 18:52:08 UTC

[1/2] git commit: updated refs/heads/4.3 to a10a9d5

Repository: cloudstack
Updated Branches:
  refs/heads/4.3 3e61df491 -> a10a9d522


appliance: upgrade systemvm to latest packages

Signed-off-by: Rohit Yadav <ro...@shapeblue.com>


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/efad7b00
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/efad7b00
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/efad7b00

Branch: refs/heads/4.3
Commit: efad7b0051b4295a2c23813844a44799a4805dd5
Parents: 3e61df4
Author: Rohit Yadav <ro...@shapeblue.com>
Authored: Wed Jan 28 23:10:31 2015 +0530
Committer: Rohit Yadav <ro...@shapeblue.com>
Committed: Wed Jan 28 23:18:56 2015 +0530

----------------------------------------------------------------------
 tools/appliance/definitions/systemvm64template/postinstall.sh | 4 +++-
 tools/appliance/definitions/systemvmtemplate/postinstall.sh   | 4 ++++
 2 files changed, 7 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/efad7b00/tools/appliance/definitions/systemvm64template/postinstall.sh
----------------------------------------------------------------------
diff --git a/tools/appliance/definitions/systemvm64template/postinstall.sh b/tools/appliance/definitions/systemvm64template/postinstall.sh
index f825cce..e1fd544 100644
--- a/tools/appliance/definitions/systemvm64template/postinstall.sh
+++ b/tools/appliance/definitions/systemvm64template/postinstall.sh
@@ -108,7 +108,9 @@ install_packages() {
   apt-get update
   apt-get --no-install-recommends -q -y --force-yes install links:i386 libuuid1:i386
 
-
+  # do a final update and upgrade
+  apt-get update
+  apt-get -y --force-yes upgrade
 }
 
 setup_accounts() {

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/efad7b00/tools/appliance/definitions/systemvmtemplate/postinstall.sh
----------------------------------------------------------------------
diff --git a/tools/appliance/definitions/systemvmtemplate/postinstall.sh b/tools/appliance/definitions/systemvmtemplate/postinstall.sh
index 9d3fa38..6fb2cb3 100644
--- a/tools/appliance/definitions/systemvmtemplate/postinstall.sh
+++ b/tools/appliance/definitions/systemvmtemplate/postinstall.sh
@@ -91,6 +91,10 @@ install_packages() {
   # apt-get -q -y --force-yes purge build-essential
 
   apt-get --no-install-recommends -q -y --force-yes install haproxy
+
+  # do a final update and upgrade
+  apt-get update
+  apt-get -y --force-yes upgrade
 }
 
 setup_accounts() {


[2/2] git commit: updated refs/heads/4.3 to a10a9d5

Posted by bh...@apache.org.
appliance: hold on to openswan version, don't upgrade

Signed-off-by: Rohit Yadav <ro...@shapeblue.com>


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/a10a9d52
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/a10a9d52
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/a10a9d52

Branch: refs/heads/4.3
Commit: a10a9d522c56f707a9674f1486f58697e8c5206a
Parents: efad7b0
Author: Rohit Yadav <ro...@shapeblue.com>
Authored: Wed Jan 28 23:21:47 2015 +0530
Committer: Rohit Yadav <ro...@shapeblue.com>
Committed: Wed Jan 28 23:21:47 2015 +0530

----------------------------------------------------------------------
 tools/appliance/definitions/systemvm64template/postinstall.sh | 1 +
 tools/appliance/definitions/systemvmtemplate/postinstall.sh   | 1 +
 2 files changed, 2 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a10a9d52/tools/appliance/definitions/systemvm64template/postinstall.sh
----------------------------------------------------------------------
diff --git a/tools/appliance/definitions/systemvm64template/postinstall.sh b/tools/appliance/definitions/systemvm64template/postinstall.sh
index e1fd544..436f7cc 100644
--- a/tools/appliance/definitions/systemvm64template/postinstall.sh
+++ b/tools/appliance/definitions/systemvm64template/postinstall.sh
@@ -64,6 +64,7 @@ install_packages() {
   echo "openswan openswan/install_x509_certificate boolean false" | debconf-set-selections
   echo "openswan openswan/install_x509_certificate seen true" | debconf-set-selections
   apt-get --no-install-recommends -q -y --force-yes install openswan=1:2.6.37-3
+  apt-mark hold openswan
 
   # xenstore utils
   apt-get --no-install-recommends -q -y --force-yes install xenstore-utils libxenstore3.0

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a10a9d52/tools/appliance/definitions/systemvmtemplate/postinstall.sh
----------------------------------------------------------------------
diff --git a/tools/appliance/definitions/systemvmtemplate/postinstall.sh b/tools/appliance/definitions/systemvmtemplate/postinstall.sh
index 6fb2cb3..30a9485 100644
--- a/tools/appliance/definitions/systemvmtemplate/postinstall.sh
+++ b/tools/appliance/definitions/systemvmtemplate/postinstall.sh
@@ -60,6 +60,7 @@ install_packages() {
   echo "openswan openswan/install_x509_certificate boolean false" | debconf-set-selections
   echo "openswan openswan/install_x509_certificate seen true" | debconf-set-selections
   apt-get --no-install-recommends -q -y --force-yes install openswan=1:2.6.37-3
+  apt-mark hold openswan
 
   # xenstore utils
   apt-get --no-install-recommends -q -y --force-yes install xenstore-utils libxenstore3.0