Return-Path: X-Original-To: apmail-cloudstack-commits-archive@www.apache.org Delivered-To: apmail-cloudstack-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 02FF017D97 for ; Mon, 23 Mar 2015 09:01:50 +0000 (UTC) Received: (qmail 99127 invoked by uid 500); 23 Mar 2015 09:01:44 -0000 Delivered-To: apmail-cloudstack-commits-archive@cloudstack.apache.org Received: (qmail 99096 invoked by uid 500); 23 Mar 2015 09:01:44 -0000 Mailing-List: contact commits-help@cloudstack.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cloudstack.apache.org Delivered-To: mailing list commits@cloudstack.apache.org Received: (qmail 99087 invoked by uid 99); 23 Mar 2015 09:01:44 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 23 Mar 2015 09:01:44 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id A1875E095C; Mon, 23 Mar 2015 09:01:44 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: bhaisaab@apache.org To: commits@cloudstack.apache.org Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: git commit: updated refs/heads/master to 6a881b9 Date: Mon, 23 Mar 2015 09:01:44 +0000 (UTC) Repository: cloudstack Updated Branches: refs/heads/master 33280ade2 -> 6a881b933 systemvmtemplate: install irqbalance from wheezy-backports Ported systemvm enhancement by Rene Moser from https://github.com/apache/cloudstack/pull/119 Signed-off-by: Rohit Yadav 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 Authored: Mon Mar 23 14:29:33 2015 +0530 Committer: Rohit Yadav 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