You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ed...@apache.org on 2014/06/05 01:50:59 UTC
[47/50] git commit: updated refs/heads/4.3 to f304df0
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/62eb0d81
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/62eb0d81
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/62eb0d81
Branch: refs/heads/4.3
Commit: 62eb0d81957bcb63503a6ec0773c83e650598246
Parents: 156bd9b
Author: Ian Duffy <ia...@ianduffy.ie>
Authored: Thu May 15 07:08:01 2014 +0100
Committer: ynojima <ma...@ynojima.net>
Committed: Wed May 28 18:21:56 2014 -0600
----------------------------------------------------------------------
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/62eb0d81/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/62eb0d81/tools/appliance/definitions/systemvm64template/base.sh
----------------------------------------------------------------------
diff --git a/tools/appliance/definitions/systemvm64template/base.sh b/tools/appliance/definitions/systemvm64template/base.sh
index 46c5db6..dee7d09 100644
--- a/tools/appliance/definitions/systemvm64template/base.sh
+++ b/tools/appliance/definitions/systemvm64template/base.sh
@@ -1,8 +1,12 @@
# Update the box
-apt-get -y update
+export DEBIAN_FRONTEND=noninteractive
+export DEBIAN_PRIORITY=critical
+
+apt-get -q -y --force-yes update
#apt-get -y install linux-headers-$(uname -r) build-essential
#apt-get -y install zlib1g-dev libssl-dev libreadline-gplv2-dev
-apt-get -y install curl unzip
+apt-get -q -y --force-yes install curl unzip
+apt-get clean
# Set up sudo
echo 'vagrant ALL=NOPASSWD:/bin/chmod, /bin/cp, /bin/mkdir, /bin/mount, /bin/umount' > /etc/sudoers.d/vagrant
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/62eb0d81/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/62eb0d81/tools/appliance/definitions/systemvmtemplate/base.sh
----------------------------------------------------------------------
diff --git a/tools/appliance/definitions/systemvmtemplate/base.sh b/tools/appliance/definitions/systemvmtemplate/base.sh
index 5aaa0ed..aabaefc 100644
--- a/tools/appliance/definitions/systemvmtemplate/base.sh
+++ b/tools/appliance/definitions/systemvmtemplate/base.sh
@@ -1,9 +1,13 @@
# Update the box
-apt-get -y update
+export DEBIAN_FRONTEND=noninteractive
+export DEBIAN_PRIORITY=critical
+
+apt-get -q -y --force-yes update
#below are needed for ruby perhaps
#apt-get -y install linux-headers-$(uname -r) build-essential
#apt-get -y install zlib1g-dev libssl-dev libreadline-gplv2-dev
-apt-get -y install curl unzip
+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/62eb0d81/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