This is an automated email from the ASF dual-hosted git repository. bhaisaab pushed a commit to branch debian9-systemvmtemplate in repository https://gitbox.apache.org/repos/asf/cloudstack.git
commit 332c791e5333e9594223d0f07ca7e00814fb7709 Author: Rohit Yadav <[email protected]> AuthorDate: Thu Nov 23 16:52:07 2017 +0530 disable services by default Signed-off-by: Rohit Yadav <[email protected]> --- systemvm/scripts/_run.sh | 22 ++++++++-------------- .../definitions/systemvmtemplate/cleanup.sh | 1 + .../configure_systemvm_services.sh | 3 +++ 3 files changed, 12 insertions(+), 14 deletions(-) diff --git a/systemvm/scripts/_run.sh b/systemvm/scripts/_run.sh index 6d77002..e3337e0 100755 --- a/systemvm/scripts/_run.sh +++ b/systemvm/scripts/_run.sh @@ -17,23 +17,17 @@ # under the License. - - - #run.sh runs the console proxy. -# make sure we delete the old files from the original template -rm console-proxy.jar -rm console-common.jar -rm conf/cloud.properties +# make sure we delete the old files from the original template +rm -f console-proxy.jar +rm -f console-common.jar +rm -f conf/cloud.properties -set -x +#set -x + +CP="./:./conf:$(ls *.jar | tr '\n' ':' | sed s'/.$//')" -CP=./:./conf -for file in *.jar -do - CP=${CP}:$file -done keyvalues= LOGHOME=/var/log/cloud/ @@ -50,7 +44,7 @@ for i in $CMDLINE keyvalues="${keyvalues} $KEY=$VALUE" esac done - + tot_mem_k=$(cat /proc/meminfo | grep MemTotal | awk '{print $2}') let "tot_mem_m=tot_mem_k>>10" let "eightypcnt=$tot_mem_m*8/10" diff --git a/tools/appliance/definitions/systemvmtemplate/cleanup.sh b/tools/appliance/definitions/systemvmtemplate/cleanup.sh index 6654ef7..758a78a 100644 --- a/tools/appliance/definitions/systemvmtemplate/cleanup.sh +++ b/tools/appliance/definitions/systemvmtemplate/cleanup.sh @@ -44,6 +44,7 @@ function cleanup_misc() { rm -fr /var/log/installer rm -f /root/.rnd rm -f /home/cloud/cloud_scripts* + rm -f /var/www/html/index.html } function cleanup() { diff --git a/tools/appliance/definitions/systemvmtemplate/configure_systemvm_services.sh b/tools/appliance/definitions/systemvmtemplate/configure_systemvm_services.sh index 1fb033c..8f3abe8 100644 --- a/tools/appliance/definitions/systemvmtemplate/configure_systemvm_services.sh +++ b/tools/appliance/definitions/systemvmtemplate/configure_systemvm_services.sh @@ -140,6 +140,8 @@ function configure_services() { do_signature systemctl daemon-reload + systemctl disable apt-daily.service + systemctl disable apt-daily.timer systemctl disable xl2tpd # Disable services that slow down boot and are not used anyway @@ -148,6 +150,7 @@ function configure_services() { systemctl disable haproxy systemctl disable apache2 systemctl disable dnsmasq + systemctl disable strongswan # Hyperv kvp daemon - 64bit only local arch=`dpkg --print-architecture` -- To stop receiving notification emails like this one, please contact "[email protected]" <[email protected]>.
