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 272e774e7159e27c347b566499352a9a72ce9768 Author: Rohit Yadav <[email protected]> AuthorDate: Fri Nov 24 18:52:46 2017 +0530 template changes Signed-off-by: Rohit Yadav <[email protected]> --- .../definitions/systemvmtemplate/cleanup.sh | 7 +++++-- .../definitions/systemvmtemplate/configure_grub.sh | 3 ++- .../definitions/systemvmtemplate/configure_login.sh | 2 ++ .../systemvmtemplate/configure_systemvm_services.sh | 21 +++++++++++++-------- 4 files changed, 22 insertions(+), 11 deletions(-) diff --git a/tools/appliance/definitions/systemvmtemplate/cleanup.sh b/tools/appliance/definitions/systemvmtemplate/cleanup.sh index 8f3b3a2..444cc94 100644 --- a/tools/appliance/definitions/systemvmtemplate/cleanup.sh +++ b/tools/appliance/definitions/systemvmtemplate/cleanup.sh @@ -20,7 +20,7 @@ set -e set -x function cleanup_apt() { - apt-get -y remove dictionaries-common busybox + apt-get -y remove dictionaries-common busybox isc-dhcp-client isc-dhcp-common apt-get -y autoremove apt-get autoclean apt-get clean @@ -40,10 +40,13 @@ function cleanup_dev() { } function cleanup_misc() { - rm -fr /var/log/* rm -fr /home/cloud/cloud_scripts* rm -f /root/.rnd rm -f /var/www/html/index.html + rm -f /var/log/*.log + rm -f /var/log/apache2/* + rm -f /var/log/messages + rm -f /var/log/syslog } function cleanup() { diff --git a/tools/appliance/definitions/systemvmtemplate/configure_grub.sh b/tools/appliance/definitions/systemvmtemplate/configure_grub.sh index ec40b7c..be1537e 100644 --- a/tools/appliance/definitions/systemvmtemplate/configure_grub.sh +++ b/tools/appliance/definitions/systemvmtemplate/configure_grub.sh @@ -31,9 +31,10 @@ GRUB_DEFAULT=0 GRUB_TIMEOUT=0 GRUB_DISTRIBUTOR=`lsb_release -i -s 2> /dev/null || echo Debian` GRUB_CMDLINE_LINUX_DEFAULT="quiet" -GRUB_CMDLINE_LINUX="console=tty1 console=ttyS0,115200n8 net.ifnames=0 biosdevname=0 debian-installer=en_US" +GRUB_CMDLINE_LINUX="console=tty0 console=ttyS0,115200n8 net.ifnames=0 biosdevname=0 debian-installer=en_US" GRUB_TERMINAL="console serial" GRUB_SERIAL_COMMAND="serial --speed=115200 --unit=0 --word=8 --parity=no --stop=1" +GRUB_GFXMODE=640x480 EOF diff --git a/tools/appliance/definitions/systemvmtemplate/configure_login.sh b/tools/appliance/definitions/systemvmtemplate/configure_login.sh index d5f80b1..a9b35db 100644 --- a/tools/appliance/definitions/systemvmtemplate/configure_login.sh +++ b/tools/appliance/definitions/systemvmtemplate/configure_login.sh @@ -62,6 +62,8 @@ function configure_inittab() { # Fix inittab cat >> /etc/inittab << EOF +1:2345:respawn:/sbin/getty 38400 tty1 + vc:2345:respawn:/sbin/getty 38400 hvc0 EOF } diff --git a/tools/appliance/definitions/systemvmtemplate/configure_systemvm_services.sh b/tools/appliance/definitions/systemvmtemplate/configure_systemvm_services.sh index fcb4e0d..b72b94a 100644 --- a/tools/appliance/definitions/systemvmtemplate/configure_systemvm_services.sh +++ b/tools/appliance/definitions/systemvmtemplate/configure_systemvm_services.sh @@ -41,9 +41,14 @@ function install_cloud_scripts() { cat > /etc/systemd/system/cloud-early-config.service << EOF [Unit] -Description=cloud-early-config: configure according to cmdline +Description=cloud-early-config: configures systemvm using cmdline DefaultDependencies=no -After=local-fs.target apparmor.service systemd-sysctl.service systemd-modules-load.service + +Before=network-pre.target +Wants=network-pre.target + +Requires=local-fs.target +After=local-fs.target [Install] WantedBy=multi-user.target @@ -142,17 +147,17 @@ function configure_services() { 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 - systemctl disable x11-common - systemctl disable console-setup - systemctl disable haproxy systemctl disable apache2 + systemctl disable conntrackd + systemctl disable console-setup systemctl disable dnsmasq - systemctl disable strongswan - + systemctl disable haproxy systemctl disable radvd + systemctl disable strongswan + systemctl disable x11-common + systemctl disable xl2tpd configure_apache2 configure_strongswan -- To stop receiving notification emails like this one, please contact "[email protected]" <[email protected]>.
