[Branch,~linaro-validation/lava-dispatcher/trunk] Rev 596: Fix bug #1175818 - MASTER_PS1 is hard_coded, not overridden by master_str.

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

Commit Message

Senthil Kumaran May 13, 2013, 8:51 a.m.
Merge authors:
  Arthur She (arthur-she)
Related merge proposals:
  https://code.launchpad.net/~arthur-she/lava-dispatcher/fix-for-bug-1175818/+merge/162946
  proposed by: Arthur She (arthur-she)
  review: Approve - Senthil Kumaran S (stylesen)
  review: Needs Fixing - Antonio Terceiro (terceiro)
------------------------------------------------------------
revno: 596 [merge]
committer: Senthil Kumaran <senthil.kumaran@linaro.org>
branch nick: trunk
timestamp: Mon 2013-05-13 14:18:28 +0530
message:
  Fix bug #1175818 - MASTER_PS1 is hard_coded, not overridden by master_str.
modified:
  lava_dispatcher/device/master.py


--
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

Patch

=== modified file 'lava_dispatcher/device/master.py'
--- lava_dispatcher/device/master.py	2013-05-02 21:43:14 +0000
+++ lava_dispatcher/device/master.py	2013-05-09 02:56:57 +0000
@@ -61,12 +61,16 @@ 
 
 class MasterImageTarget(Target):
 
-    MASTER_PS1 = 'root@master [rc=$(echo \$?)]# '
-    MASTER_PS1_PATTERN = 'root@master \[rc=(\d+)\]# '
+    MASTER_PS1 = ' [rc=$(echo \$?)]# '
+    MASTER_PS1_PATTERN = ' \[rc=(\d+)\]# '
 
     def __init__(self, context, config):
         super(MasterImageTarget, self).__init__(context, config)
 
+        # Update variable according to config file
+        self.MASTER_PS1 = self.config.master_str + self.MASTER_PS1
+        self.MASTER_PS1_PATTERN = self.config.master_str + self.MASTER_PS1_PATTERN
+
         Target.android_deployment_data['boot_cmds'] = 'boot_cmds_android'
         Target.ubuntu_deployment_data['boot_cmds'] = 'boot_cmds'
         Target.oe_deployment_data['boot_cmds'] = 'boot_cmds_oe'