You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by bh...@apache.org on 2015/03/23 10:01:44 UTC
git commit: updated refs/heads/master to 6a881b9
Repository: cloudstack
Updated Branches:
refs/heads/master 33280ade2 -> 6a881b933
systemvmtemplate: install irqbalance from wheezy-backports
Ported systemvm enhancement by Rene Moser <re...@swisstxt.ch> from
https://github.com/apache/cloudstack/pull/119
Signed-off-by: Rohit Yadav <ro...@shapeblue.com>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/6a881b93
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/6a881b93
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/6a881b93
Branch: refs/heads/master
Commit: 6a881b93373f26af2f0786435022771faedd0d10
Parents: 33280ad
Author: Rohit Yadav <ro...@shapeblue.com>
Authored: Mon Mar 23 14:29:33 2015 +0530
Committer: Rohit Yadav <ro...@shapeblue.com>
Committed: Mon Mar 23 14:31:12 2015 +0530
----------------------------------------------------------------------
.../systemvmtemplate/install_systemvm_packages.sh | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6a881b93/tools/appliance/definitions/systemvmtemplate/install_systemvm_packages.sh
----------------------------------------------------------------------
diff --git a/tools/appliance/definitions/systemvmtemplate/install_systemvm_packages.sh b/tools/appliance/definitions/systemvmtemplate/install_systemvm_packages.sh
index dd2931f..1804a58 100644
--- a/tools/appliance/definitions/systemvmtemplate/install_systemvm_packages.sh
+++ b/tools/appliance/definitions/systemvmtemplate/install_systemvm_packages.sh
@@ -42,16 +42,16 @@ function install_packages() {
debconf_packages
install_vhd_util
- local apt_install="apt-get --no-install-recommends -q -y --force-yes install"
+ local apt_get="apt-get --no-install-recommends -q -y --force-yes"
#32 bit architecture support:: not required for 32 bit template
if [ "${arch}" != "i386" ]; then
dpkg --add-architecture i386
apt-get update
- ${apt_install} links:i386 libuuid1:i386
+ ${apt_get} install links:i386 libuuid1:i386
fi
- ${apt_install} \
+ ${apt_get} install \
rsyslog logrotate cron chkconfig insserv net-tools ifupdown vim-tiny netbase iptables \
openssh-server e2fsprogs dhcp3-client tcpdump socat wget \
python bzip2 sed gawk diffutils grep gzip less tar telnet ftp rsync traceroute psmisc lsof procps \
@@ -60,7 +60,7 @@ function install_packages() {
sysstat python-netaddr \
apache2 ssl-cert \
dnsmasq dnsmasq-utils \
- nfs-common irqbalance \
+ nfs-common \
samba-common cifs-utils \
xl2tpd bcrelay ppp ipsec-tools tdb-tools \
openswan=1:2.6.37-3 \
@@ -76,13 +76,15 @@ function install_packages() {
radvd \
sharutils
+ ${apt_get} -t wheezy-backports install irqbalance
+
# hold on installed openswan version, upgrade rest of the packages (if any)
apt-mark hold openswan
apt-get update
apt-get -y --force-yes upgrade
# commented out installation of vmware-tools as we are using the open source open-vm-tools:
- # ${apt_install} build-essential linux-headers-`uname -r`
+ # ${apt_get} install build-essential linux-headers-`uname -r`
# df -h
# PREVDIR=$PWD
# cd /opt