Bug 2779938: Many client jobs fail from fsck-induced double reboots. 
Avoid fsck when booting to target kernel at start of job, to
avoid possible reboots back to default kernel.

Signed-off-by: Duane Sand <[email protected]>

--- autotest/client/bin/kernel.py       2010-08-09 15:15:36.000000000 -0700
+++ autotest/client/bin/kernel.py       2010-08-09 15:03:31.000000000 -0700
@@ -546,6 +546,9 @@
         # Boot the selected tag.
         self.add_to_bootloader(args=args, tag=self.installed_as)
 
+        # defer fsck for next reboot, to avoid reboots back to default kernel
+        utils.system('touch /fastboot')  # this file is removed automatically
+
         # Boot it.
         self.job.start_reboot()
         self.job.reboot(tag=self.installed_as)
--- autotest/client/bin/kernel_unittest.py      2010-08-09 15:15:36.000000000 
-0700
+++ autotest/client/bin/kernel_unittest.py      2010-08-09 15:03:31.000000000 
-0700
@@ -588,6 +588,7 @@
         self.kernel.install.expect_call()
         self.kernel.add_to_bootloader.expect_call(args=args,
             tag=False)
+        utils.system.expect_call('touch /fastboot')
         self.job.start_reboot.expect_call()
         self.job.reboot.expect_call(tag=False)
 
@@ -613,6 +614,7 @@
         self.kernel.install.expect_call()
         self.kernel.add_to_bootloader.expect_call(args=args,
             tag=False)
+        utils.system.expect_call('touch /fastboot')
         self.job.start_reboot.expect_call()
         self.job.reboot.expect_call(tag=False)
_______________________________________________
Autotest mailing list
[email protected]
http://test.kernel.org/cgi-bin/mailman/listinfo/autotest

Reply via email to