You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ts...@apache.org on 2013/07/26 20:43:51 UTC
[1/2] git commit: updated refs/heads/master to 0f78703
Updated Branches:
refs/heads/master adc72812f -> 0f7870332
CLOUDSTACK-3797: Fix wget installation of xs-tools in to the builtin
Signed-off-by: Prasanna Santhanam <ts...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/0f787033
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/0f787033
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/0f787033
Branch: refs/heads/master
Commit: 0f7870332ad2080d9f61da463308fe52438d1cc7
Parents: 4bf7abc
Author: Prasanna Santhanam <ts...@apache.org>
Authored: Sat Jul 27 00:01:02 2013 +0530
Committer: Prasanna Santhanam <ts...@apache.org>
Committed: Sat Jul 27 00:02:28 2013 +0530
----------------------------------------------------------------------
tools/appliance/definitions/builtin/install-xs-tools.sh | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/0f787033/tools/appliance/definitions/builtin/install-xs-tools.sh
----------------------------------------------------------------------
diff --git a/tools/appliance/definitions/builtin/install-xs-tools.sh b/tools/appliance/definitions/builtin/install-xs-tools.sh
index 68f076e..fc3bd47 100644
--- a/tools/appliance/definitions/builtin/install-xs-tools.sh
+++ b/tools/appliance/definitions/builtin/install-xs-tools.sh
@@ -1,7 +1,7 @@
# get the latest xs tools available from xen.org
-wget --no-check-certificate http://downloads.xen.org/XCP/debian/xs-tools-5.9.960.iso -o xs-tools.iso
+wget --no-check-certificate http://downloads.xen.org/XCP/debian/xs-tools-5.9.960.iso -O xs-tools.iso
sudo mount -o loop xs-tools.iso /mnt
#install the xs tools
-sudo sh /mnt/Linux/install.sh
+sudo yes | sudo sh /mnt/Linux/install.sh
[2/2] git commit: updated refs/heads/master to 0f78703
Posted by ts...@apache.org.
CLOUDSTACK-3797: remove duplicate packages from base.sh already in postinstall.sh
Signed-off-by: Prasanna Santhanam <ts...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/4bf7abcb
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/4bf7abcb
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/4bf7abcb
Branch: refs/heads/master
Commit: 4bf7abcbe9378cde9a3709a0b0a26582813d0188
Parents: adc7281
Author: Prasanna Santhanam <ts...@apache.org>
Authored: Fri Jul 26 23:58:35 2013 +0530
Committer: Prasanna Santhanam <ts...@apache.org>
Committed: Sat Jul 27 00:02:28 2013 +0530
----------------------------------------------------------------------
tools/appliance/definitions/builtin/base.sh | 3 ---
tools/appliance/definitions/builtin/postinstall.sh | 4 +---
2 files changed, 1 insertion(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/4bf7abcb/tools/appliance/definitions/builtin/base.sh
----------------------------------------------------------------------
diff --git a/tools/appliance/definitions/builtin/base.sh b/tools/appliance/definitions/builtin/base.sh
index 4b7eeae..3813869 100644
--- a/tools/appliance/definitions/builtin/base.sh
+++ b/tools/appliance/definitions/builtin/base.sh
@@ -10,8 +10,5 @@ enabled=1
gpgcheck=0
EOM
-# libs for compiling other packages
-yum -y install wget vim-enhanced htop telnet tcpdump sed httpd
-
# Make ssh faster by not waiting on DNS
echo "UseDNS no" >> /etc/ssh/sshd_config
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/4bf7abcb/tools/appliance/definitions/builtin/postinstall.sh
----------------------------------------------------------------------
diff --git a/tools/appliance/definitions/builtin/postinstall.sh b/tools/appliance/definitions/builtin/postinstall.sh
index c9b8003..5af147e 100644
--- a/tools/appliance/definitions/builtin/postinstall.sh
+++ b/tools/appliance/definitions/builtin/postinstall.sh
@@ -18,11 +18,9 @@
set -x
install_packages() {
- # xen
- yum -y install xen-tools
# dev tools, ssh, nfs
- yum -y install telnet tcpdump sed awk ssh
+ yum -y install wget telnet tcpdump sed awk ssh htop
# utlities
yum -y install httpd