cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bhais...@apache.org
Subject git commit: updated refs/heads/4.4 to f1cccf6
Date Wed, 28 Jan 2015 17:52:42 GMT
Repository: cloudstack
Updated Branches:
  refs/heads/4.4 15dd76c4c -> f1cccf6fe


appliance: hold on to openswan version, don't upgrade

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
(cherry picked from commit a10a9d522c56f707a9674f1486f58697e8c5206a)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>


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

Branch: refs/heads/4.4
Commit: f1cccf6feca9cab5a858019fb55003c4c2272d04
Parents: 15dd76c
Author: Rohit Yadav <rohit.yadav@shapeblue.com>
Authored: Wed Jan 28 23:21:47 2015 +0530
Committer: Rohit Yadav <rohit.yadav@shapeblue.com>
Committed: Wed Jan 28 23:22:33 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/f1cccf6f/tools/appliance/definitions/systemvm64template/postinstall.sh
----------------------------------------------------------------------
diff --git a/tools/appliance/definitions/systemvm64template/postinstall.sh b/tools/appliance/definitions/systemvm64template/postinstall.sh
index 7a95436..ae88e50 100644
--- a/tools/appliance/definitions/systemvm64template/postinstall.sh
+++ b/tools/appliance/definitions/systemvm64template/postinstall.sh
@@ -62,6 +62,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/f1cccf6f/tools/appliance/definitions/systemvmtemplate/postinstall.sh
----------------------------------------------------------------------
diff --git a/tools/appliance/definitions/systemvmtemplate/postinstall.sh b/tools/appliance/definitions/systemvmtemplate/postinstall.sh
index 167ff81..2f070f2 100644
--- a/tools/appliance/definitions/systemvmtemplate/postinstall.sh
+++ b/tools/appliance/definitions/systemvmtemplate/postinstall.sh
@@ -62,6 +62,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


Mime
View raw message