This is an automated email from the ASF dual-hosted git repository. rohit pushed a commit to branch debian9-systemvmtemplate in repository https://gitbox.apache.org/repos/asf/cloudstack.git
commit 2f1ae96ec33c4ade159480f217f26b922aef479e Author: Rohit Yadav <rohit.ya...@shapeblue.com> AuthorDate: Mon Dec 11 10:15:32 2017 +0530 fsck on systemvm boot Signed-off-by: Rohit Yadav <rohit.ya...@shapeblue.com> --- test/integration/smoke/test_snapshots.py | 2 +- tools/appliance/definitions/systemvmtemplate/apt_upgrade.sh | 5 +++-- tools/appliance/definitions/systemvmtemplate/configure_grub.sh | 2 +- tools/appliance/definitions/systemvmtemplate/finalize.sh | 4 ++-- 4 files changed, 7 insertions(+), 6 deletions(-) diff --git a/test/integration/smoke/test_snapshots.py b/test/integration/smoke/test_snapshots.py index a75a1e9..6e9a877 100644 --- a/test/integration/smoke/test_snapshots.py +++ b/test/integration/smoke/test_snapshots.py @@ -62,7 +62,7 @@ class TestSnapshotRootDisk(cloudstackTestCase): cls._cleanup = [] if not cls.hypervisorNotSupported: - cls.template = get_test_template(cls.apiclient, cl.zone.id, cls.hypervisor) + cls.template = get_test_template(cls.apiclient, cls.zone.id, cls.hypervisor) if cls.template == FAILED: assert False, "get_test_template() failed to return template" diff --git a/tools/appliance/definitions/systemvmtemplate/apt_upgrade.sh b/tools/appliance/definitions/systemvmtemplate/apt_upgrade.sh index 6f37e34..2d7394d 100644 --- a/tools/appliance/definitions/systemvmtemplate/apt_upgrade.sh +++ b/tools/appliance/definitions/systemvmtemplate/apt_upgrade.sh @@ -19,10 +19,11 @@ set -e set -x -function remove_reserved_blocks() { +function fix_tune2fs() { for partition in $(blkid -o list | grep ext | awk '{print $1}') do tune2fs -m0 $partition + tune2fs -c 1 $partition done fdisk -l df -h @@ -42,7 +43,7 @@ function apt_upgrade() { # Setup sudo echo 'cloud ALL=(ALL) NOPASSWD: ALL' > /etc/sudoers.d/cloud - remove_reserved_blocks + fix_tune2fs add_backports rm -fv /root/*.iso diff --git a/tools/appliance/definitions/systemvmtemplate/configure_grub.sh b/tools/appliance/definitions/systemvmtemplate/configure_grub.sh index 85f9da2..4a42dc6 100644 --- a/tools/appliance/definitions/systemvmtemplate/configure_grub.sh +++ b/tools/appliance/definitions/systemvmtemplate/configure_grub.sh @@ -28,7 +28,7 @@ GRUB_DEFAULT=0 GRUB_TIMEOUT=0 GRUB_DISTRIBUTOR=Debian GRUB_CMDLINE_LINUX_DEFAULT="quiet" -GRUB_CMDLINE_LINUX="console=tty0 console=ttyS0,115200n8 console=hvc0 earlyprintk=xen net.ifnames=0 biosdevname=0 debian-installer=en_US nomodeset" +GRUB_CMDLINE_LINUX="console=tty0 console=ttyS0,115200n8 console=hvc0 earlyprintk=xen net.ifnames=0 biosdevname=0 debian-installer=en_US fsck.mode=force nomodeset" GRUB_CMDLINE_XEN="com1=115200 console=com1" GRUB_TERMINAL="console serial" GRUB_SERIAL_COMMAND="serial --speed=115200 --unit=0 --word=8 --parity=no --stop=1" diff --git a/tools/appliance/definitions/systemvmtemplate/finalize.sh b/tools/appliance/definitions/systemvmtemplate/finalize.sh index 912887c..febae7b 100644 --- a/tools/appliance/definitions/systemvmtemplate/finalize.sh +++ b/tools/appliance/definitions/systemvmtemplate/finalize.sh @@ -51,14 +51,14 @@ function cleanup_veewee() { # Zero out the free space to save space in the final image: function zero_disk() { + df -h + fstrim -av for path in / /boot /var/log /tmp do dd if=/dev/zero of=${path}/zero bs=1M || true sync rm -f ${path}/zero done - fstrim -av - df -h } function finalize() { -- To stop receiving notification emails like this one, please contact "commits@cloudstack.apache.org" <commits@cloudstack.apache.org>.