You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by da...@apache.org on 2014/05/23 10:16:20 UTC
git commit: updated refs/heads/4.4 to ec28b2b
Repository: cloudstack
Updated Branches:
refs/heads/4.4 f002e4d16 -> ec28b2bc2
Resolve issue with build script for systemvm hanging due to libssl waiting on a input prompt caused by apt-get update
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/ec28b2bc
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/ec28b2bc
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/ec28b2bc
Branch: refs/heads/4.4
Commit: ec28b2bc2750e34091ebbda65f1490368b0bf519
Parents: f002e4d
Author: Ian Duffy <ia...@ianduffy.ie>
Authored: Thu May 15 07:08:01 2014 +0100
Committer: Daan Hoogland <da...@onecht.net>
Committed: Fri May 23 10:16:13 2014 +0200
----------------------------------------------------------------------
tools/appliance/build.sh | 0
tools/appliance/definitions/systemvm64template/base.sh | 8 ++++++--
tools/appliance/definitions/systemvm64template/preseed.cfg | 5 +++++
tools/appliance/definitions/systemvmtemplate/base.sh | 8 ++++++--
tools/appliance/definitions/systemvmtemplate/preseed.cfg | 6 ++++++
5 files changed, 23 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/ec28b2bc/tools/appliance/build.sh
----------------------------------------------------------------------
diff --git a/tools/appliance/build.sh b/tools/appliance/build.sh
old mode 100644
new mode 100755
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/ec28b2bc/tools/appliance/definitions/systemvm64template/base.sh
----------------------------------------------------------------------
diff --git a/tools/appliance/definitions/systemvm64template/base.sh b/tools/appliance/definitions/systemvm64template/base.sh
index bc03ffe..8166081 100644
--- a/tools/appliance/definitions/systemvm64template/base.sh
+++ b/tools/appliance/definitions/systemvm64template/base.sh
@@ -1,6 +1,10 @@
# Update the box
-apt-get -y update
-apt-get -y install curl unzip
+
+export DEBIAN_FRONTEND=noninteractive
+export DEBIAN_PRIORITY=critical
+
+apt-get -q -y --force-yes update
+apt-get -q -y --force-yes install curl unzip
apt-get clean
# Set up sudo, TODO: Check security concerns
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/ec28b2bc/tools/appliance/definitions/systemvm64template/preseed.cfg
----------------------------------------------------------------------
diff --git a/tools/appliance/definitions/systemvm64template/preseed.cfg b/tools/appliance/definitions/systemvm64template/preseed.cfg
index 6996565..635432a 100644
--- a/tools/appliance/definitions/systemvm64template/preseed.cfg
+++ b/tools/appliance/definitions/systemvm64template/preseed.cfg
@@ -334,6 +334,11 @@ d-i finish-install/reboot_in_progress note
# debconf-get-selections --installer > file
# debconf-get-selections >> file
+libssl1.0.0 libssl1.0.0/restart-services string
+libssl1.0.0:amd64 libssl1.0.0/restart-services string
+
+libssl1.0.0 libssl1.0.0/restart-failed error
+libssl1.0.0:amd64 libssl1.0.0/restart-failed error
#### Advanced options
### Running custom commands during the installation
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/ec28b2bc/tools/appliance/definitions/systemvmtemplate/base.sh
----------------------------------------------------------------------
diff --git a/tools/appliance/definitions/systemvmtemplate/base.sh b/tools/appliance/definitions/systemvmtemplate/base.sh
index bc03ffe..8166081 100644
--- a/tools/appliance/definitions/systemvmtemplate/base.sh
+++ b/tools/appliance/definitions/systemvmtemplate/base.sh
@@ -1,6 +1,10 @@
# Update the box
-apt-get -y update
-apt-get -y install curl unzip
+
+export DEBIAN_FRONTEND=noninteractive
+export DEBIAN_PRIORITY=critical
+
+apt-get -q -y --force-yes update
+apt-get -q -y --force-yes install curl unzip
apt-get clean
# Set up sudo, TODO: Check security concerns
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/ec28b2bc/tools/appliance/definitions/systemvmtemplate/preseed.cfg
----------------------------------------------------------------------
diff --git a/tools/appliance/definitions/systemvmtemplate/preseed.cfg b/tools/appliance/definitions/systemvmtemplate/preseed.cfg
index 6996565..deb2f94 100644
--- a/tools/appliance/definitions/systemvmtemplate/preseed.cfg
+++ b/tools/appliance/definitions/systemvmtemplate/preseed.cfg
@@ -335,6 +335,12 @@ d-i finish-install/reboot_in_progress note
# debconf-get-selections >> file
+libssl1.0.0 libssl1.0.0/restart-services string
+libssl1.0.0:i386 libssl1.0.0/restart-services string
+
+libssl1.0.0 libssl1.0.0/restart-failed error
+libssl1.0.0:i386 libssl1.0.0/restart-failed error
+
#### Advanced options
### Running custom commands during the installation
# d-i preseeding is inherently not secure. Nothing in the installer checks