cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ro...@apache.org
Subject [cloudstack] branch debian9-systemvmtemplate updated: fsck on systemvm boot
Date Mon, 11 Dec 2017 04:45:59 GMT
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


The following commit(s) were added to refs/heads/debian9-systemvmtemplate by this push:
     new c9d783a  fsck on systemvm boot
c9d783a is described below

commit c9d783a8d425c09708f8bdb9beeb969ed792da83
Author: Rohit Yadav <rohit.yadav@shapeblue.com>
AuthorDate: Mon Dec 11 10:15:32 2017 +0530

    fsck on systemvm boot
    
    Signed-off-by: Rohit Yadav <rohit.yadav@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 +-
 3 files changed, 5 insertions(+), 4 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"

-- 
To stop receiving notification emails like this one, please contact
['"commits@cloudstack.apache.org" <commits@cloudstack.apache.org>'].

Mime
View raw message