Merge lp:~stylesen/lava-dispatcher/fix-bug-1172235 into lp:lava-dispatcher

[Senthil Kumaran S]

Specify correct root partitions which affects devices like snowball.

[Dave Pigott (dpigott)]

Not sure I completely like the dependence on ttyAMA2 being in the boot args, but for now can't think of a better way. +1

review: Approve

[Fathi Boudra (fboudra)]

Agree with Dave. I don't like much the snowball exception approach (and the hardcoded partition number n+2). It's fine as band-aid but a bug to fix sanely the issue will be appreciated.

[Dave Pigott (dpigott)]

Turns out it was unnecessary anyway. Senthil is applying the proper fix now.

=== modified file 'lava_dispatcher/device/master.py'
--- lava_dispatcher/device/master.py	2013-04-22 09:39:22 +0000
+++ lava_dispatcher/device/master.py	2013-04-24 11:12:25 +0000
@@ -182,11 +182,23 @@
         """
         Returns boot_cmds list after rewriting things such as:
         
-        partition number from n to n+2
-        root=LABEL=testrootfs instead of root=UUID=ab34-...
+        * partition number from n to n+2
+        * root=LABEL=testrootfs or root=/dev/mmcblk1p5 instead of
+          root=UUID=ab34-...
         """
-        boot_cmds = re.sub(
-            r"root=UUID=\S+", "root=LABEL=testrootfs", boot_cmds, re.MULTILINE)
+
+        # This console value is specific to snowball. A snowball has mmcblk1
+        if 'ttyAMA2' in boot_cmds:
+            boot_cmds = re.sub(r"root=UUID=\S+",
+                               "root=/dev/mmcblk1p5",
+                               boot_cmds,
+                               re.MULTILINE)
+        else:
+            boot_cmds = re.sub(r"root=UUID=\S+",
+                               "root=LABEL=testrootfs",
+                               boot_cmds,
+                               re.MULTILINE)
+
         pattern = "\s+\d+:(?P<partition>\d+)\s+"
         boot_cmds = re.sub(
             pattern, self._rewrite_partition_number, boot_cmds, re.MULTILINE)