You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by hu...@apache.org on 2014/01/31 09:47:43 UTC
[3/4] git commit: updated refs/heads/master to d578d7e
updating the jre to version 7 on system vms
(cherry picked from commit fc2e7ec70a1cc48a10a168ec3df607b49a7bcdf6)
Signed-off-by: Hugo Trippaers <ht...@schubergphilis.com>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/06853711
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/06853711
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/06853711
Branch: refs/heads/master
Commit: 0685371179a22035351be1fa6151a39f16865ae6
Parents: 8f10ded
Author: Abhinandan Prateek <ap...@apache.org>
Authored: Fri Jan 17 16:11:28 2014 +0530
Committer: Hugo Trippaers <ht...@schubergphilis.com>
Committed: Fri Jan 31 09:41:41 2014 +0100
----------------------------------------------------------------------
tools/appliance/definitions/systemvm64template/postinstall.sh | 2 +-
tools/appliance/definitions/systemvmtemplate/postinstall.sh | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/06853711/tools/appliance/definitions/systemvm64template/postinstall.sh
----------------------------------------------------------------------
diff --git a/tools/appliance/definitions/systemvm64template/postinstall.sh b/tools/appliance/definitions/systemvm64template/postinstall.sh
index a9a057d..144187d 100644
--- a/tools/appliance/definitions/systemvm64template/postinstall.sh
+++ b/tools/appliance/definitions/systemvm64template/postinstall.sh
@@ -69,7 +69,7 @@ install_packages() {
# ipcalc
apt-get --no-install-recommends -q -y --force-yes install ipcalc
# java
- apt-get --no-install-recommends -q -y --force-yes install default-jre-headless
+ apt-get --no-install-recommends -q -y --force-yes install openjdk-7-jre-headless
echo "iptables-persistent iptables-persistent/autosave_v4 boolean true" | debconf-set-selections
echo "iptables-persistent iptables-persistent/autosave_v6 boolean true" | debconf-set-selections
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/06853711/tools/appliance/definitions/systemvmtemplate/postinstall.sh
----------------------------------------------------------------------
diff --git a/tools/appliance/definitions/systemvmtemplate/postinstall.sh b/tools/appliance/definitions/systemvmtemplate/postinstall.sh
index 48ba04b..a4ff11f 100644
--- a/tools/appliance/definitions/systemvmtemplate/postinstall.sh
+++ b/tools/appliance/definitions/systemvmtemplate/postinstall.sh
@@ -65,7 +65,7 @@ install_packages() {
# ipcalc
apt-get --no-install-recommends -q -y --force-yes install ipcalc
# java
- apt-get --no-install-recommends -q -y --force-yes install default-jre-headless
+ apt-get --no-install-recommends -q -y --force-yes install openjdk-7-jre-headless
echo "iptables-persistent iptables-persistent/autosave_v4 boolean true" | debconf-set-selections
echo "iptables-persistent iptables-persistent/autosave_v6 boolean true" | debconf-set-selections