From 553a9ab853ab9baba4aae3b80351ba7edfff4065 Mon Sep 17 00:00:00 2001 From: Jayapal Date: Wed, 13 Nov 2013 15:11:07 +0530 Subject: [PATCH] CLOUDSTACK-4958 Removing installing monit from the postinstall.sh template script Monit is AGPL package so removing it from the script which installs in template --- tools/appliance/definitions/systemvm64template/postinstall.sh | 3 +-- tools/appliance/definitions/systemvmtemplate/postinstall.sh | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/tools/appliance/definitions/systemvm64template/postinstall.sh b/tools/appliance/definitions/systemvm64template/postinstall.sh index 3755b525aab..d9ce8a17163 100644 --- a/tools/appliance/definitions/systemvm64template/postinstall.sh +++ b/tools/appliance/definitions/systemvm64template/postinstall.sh @@ -36,7 +36,7 @@ install_packages() { apt-get --no-install-recommends -q -y --force-yes install rsyslog logrotate cron chkconfig insserv net-tools ifupdown vim-tiny netbase iptables apt-get --no-install-recommends -q -y --force-yes install openssh-server openssl e2fsprogs dhcp3-client tcpdump socat wget # apt-get --no-install-recommends -q -y --force-yes install grub-legacy - apt-get --no-install-recommends -q -y --force-yes install python bzip2 sed gawk diffutils grep gzip less tar telnet ftp rsync traceroute psmisc lsof procps monit inetutils-ping iputils-arping httping + apt-get --no-install-recommends -q -y --force-yes install python bzip2 sed gawk diffutils grep gzip less tar telnet ftp rsync traceroute psmisc lsof procps inetutils-ping iputils-arping httping apt-get --no-install-recommends -q -y --force-yes install dnsutils zip unzip ethtool uuid file iproute acpid virt-what sudo # sysstat @@ -220,7 +220,6 @@ configure_services() { chkconfig cloud-passwd-srvr off chkconfig --add cloud chkconfig cloud off - chkconfig monit off chkconfig xl2tpd off } diff --git a/tools/appliance/definitions/systemvmtemplate/postinstall.sh b/tools/appliance/definitions/systemvmtemplate/postinstall.sh index 1309d47a9f5..9ea009c5de3 100644 --- a/tools/appliance/definitions/systemvmtemplate/postinstall.sh +++ b/tools/appliance/definitions/systemvmtemplate/postinstall.sh @@ -35,7 +35,7 @@ install_packages() { apt-get --no-install-recommends -q -y --force-yes install rsyslog logrotate cron chkconfig insserv net-tools ifupdown vim-tiny netbase iptables apt-get --no-install-recommends -q -y --force-yes install openssh-server openssl e2fsprogs dhcp3-client tcpdump socat wget # apt-get --no-install-recommends -q -y --force-yes install grub-legacy - apt-get --no-install-recommends -q -y --force-yes install python bzip2 sed gawk diffutils grep gzip less tar telnet ftp rsync traceroute psmisc lsof procps monit inetutils-ping iputils-arping httping + apt-get --no-install-recommends -q -y --force-yes install python bzip2 sed gawk diffutils grep gzip less tar telnet ftp rsync traceroute psmisc lsof procps inetutils-ping iputils-arping httping apt-get --no-install-recommends -q -y --force-yes install dnsutils zip unzip ethtool uuid file iproute acpid virt-what sudo # sysstat @@ -219,7 +219,6 @@ configure_services() { chkconfig cloud-passwd-srvr off chkconfig --add cloud chkconfig cloud off - chkconfig monit off chkconfig xl2tpd off }