diff mbox

[Branch,~linaro-validation/lava-dispatcher/trunk] Rev 275: allow overriding the command to stop the normal boot process and string to look for to know that ...

Message ID 20120418001014.22748.51512.launchpad@ackee.canonical.com
State Accepted
Headers show

Commit Message

Michael-Doyle Hudson April 18, 2012, 12:10 a.m. UTC 
Merge authors:
  Abner Silva (abnerf)
Related merge proposals:
  https://code.launchpad.net/~abnerf/lava-dispatcher/lava-dispatcher/+merge/102336
  proposed by: Abner Silva (abnerf)
  review: Approve - Michael Hudson-Doyle (mwhudson)
  review: Approve - Zygmunt Krynicki (zkrynicki)
------------------------------------------------------------
revno: 275 [merge]
committer: Michael Hudson-Doyle <michael.hudson@linaro.org>
branch nick: trunk
timestamp: Wed 2012-04-18 12:08:46 +1200
message:
  allow overriding the command to stop the normal boot process and string to look for to know that the boot process has begun from the device config
modified:
  lava_dispatcher/client/master.py
  lava_dispatcher/default-config/lava-dispatcher/device-defaults.conf


--
lp:lava-dispatcher
https://code.launchpad.net/~linaro-validation/lava-dispatcher/trunk

You are subscribed to branch lp:lava-dispatcher.
To unsubscribe from this branch go to https://code.launchpad.net/~linaro-validation/lava-dispatcher/trunk/+edit-subscription
diff mbox

Patch

=== modified file 'lava_dispatcher/client/master.py'
--- lava_dispatcher/client/master.py	2012-04-02 11:36:56 +0000
+++ lava_dispatcher/client/master.py	2012-04-17 15:40:25 +0000
@@ -458,7 +458,8 @@ 
         logging.info("Boot the system master image")
         self.soft_reboot()
         try:
-            self.proc.expect("Uncompressing Linux")
+            image_boot_msg = self.device_option('image_boot_msg')
+            self.proc.expect(image_boot_msg)
             self._in_master_shell(300)
         except:
             logging.exception("in_master_shell failed")
@@ -651,7 +652,9 @@ 
     def _enter_uboot(self):
         interrupt_boot_prompt = self.device_option('interrupt_boot_prompt')
         self.proc.expect(interrupt_boot_prompt)
-        self.proc.sendline("")
+
+        interrupt_boot_command = self.device_option('interrupt_boot_command')
+        self.proc.sendline(interrupt_boot_command)
 
     def _boot_linaro_image(self):
         self._boot(string_to_list(self.config.get('boot_cmds')))

=== modified file 'lava_dispatcher/default-config/lava-dispatcher/device-defaults.conf'
--- lava_dispatcher/default-config/lava-dispatcher/device-defaults.conf	2012-03-26 11:46:50 +0000
+++ lava_dispatcher/default-config/lava-dispatcher/device-defaults.conf	2012-04-17 15:40:25 +0000
@@ -85,6 +85,12 @@ 
 # The string to look for to interrupt the boot process
 interrupt_boot_prompt = Hit any key to stop autoboot
 
+# The string command to stop the normal boot process
+interrupt_boot_command = ""
+
+# The string to look for to know that the boot process has begun
+image_boot_msg = Uncompressing Linux
+
 # The character the boot loader uses as a prompt on this board.
 bootloader_prompt = #