diff mbox

[Branch,~linaro-validation/lava-dispatcher/trunk] Rev 401: update the sed command for mount sdcard of android image with the mount point of /storage/sdcard0

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

Commit Message

Yongqin Liu Oct. 16, 2012, 12:02 a.m. UTC 
Merge authors:
  Yongqin Liu (liuyq0307)
Related merge proposals:
  https://code.launchpad.net/~liuyq0307/lava-dispatcher/sdcard-mount/+merge/129693
  proposed by: Yongqin Liu (liuyq0307)
  review: Approve - Andy Doan (doanac)
------------------------------------------------------------
revno: 401 [merge]
committer: Yongqin Liu <yongqin.liu@linaro.org>
branch nick: lava-dispatcher
timestamp: Mon 2012-10-15 17:00:41 -0700
message:
  update the sed command for mount sdcard of android image with the mount point of /storage/sdcard0
modified:
  lava_dispatcher/config.py
  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
diff mbox

Patch

=== modified file 'lava_dispatcher/config.py'
--- lava_dispatcher/config.py	2012-10-02 20:54:32 +0000
+++ lava_dispatcher/config.py	2012-10-15 15:22:51 +0000
@@ -65,6 +65,7 @@ 
     tester_hostname = schema.StringOption(default="linaro")
     tester_str = schema.StringOption()
     val = schema.StringOption()
+    sdcard_mountpoint_path = schema.StringOption(default="/storage/sdcard0")
 
     simulator_binary = schema.StringOption()
     license_server = schema.StringOption()

=== modified file 'lava_dispatcher/device/master.py'
--- lava_dispatcher/device/master.py	2012-10-15 15:15:14 +0000
+++ lava_dispatcher/device/master.py	2012-10-16 00:00:41 +0000
@@ -610,10 +610,12 @@ 
         # If there is no userdata partition on the sdcard(like iMX and Origen),
         # then the sdcard partition will be used as the userdata partition as
         # before, and so cannot be used here as the sdcard on android
-        original = 'dev_mount sdcard /mnt/sdcard %s ' % (
+        original = 'dev_mount sdcard %s %s ' % (
+            target.config.sdcard_mountpoint_path,
             target.config.sdcard_part_android_org)
-        replacement = 'dev_mount sdcard /mnt/sdcard %s ' % (
-            target.sdcard_part_lava)
+        replacement = 'dev_mount sdcard %s %s ' % (
+            target.config.sdcard_mountpoint_path,
+            target.config.sdcard_part_android)
         sed_cmd = "s@{original}@{replacement}@".format(original=original,
                                                        replacement=replacement)
         session.run(