From patchwork Fri Sep 14 02:42:11 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yongqin Liu X-Patchwork-Id: 11407 Return-Path: X-Original-To: patchwork@peony.canonical.com Delivered-To: patchwork@peony.canonical.com Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145]) by peony.canonical.com (Postfix) with ESMTP id A328923E00 for ; Fri, 14 Sep 2012 02:43:20 +0000 (UTC) Received: from mail-iy0-f180.google.com (mail-iy0-f180.google.com [209.85.210.180]) by fiordland.canonical.com (Postfix) with ESMTP id 65BD9A2F659 for ; Fri, 14 Sep 2012 02:42:15 +0000 (UTC) Received: by iafj25 with SMTP id j25so2624017iaf.11 for ; Thu, 13 Sep 2012 19:42:14 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-forwarded-to:x-forwarded-for:delivered-to:received-spf :content-type:mime-version:x-launchpad-project:x-launchpad-branch :x-launchpad-message-rationale:x-launchpad-branch-revision-number :x-launchpad-notification-type:to:from:subject:message-id:date :reply-to:sender:errors-to:precedence:x-generated-by :x-launchpad-hash:x-gm-message-state; bh=nkeIVdhxdcNGjA1EDqu1HkNlzcTjf3ixA0DQx0AzaRQ=; b=IqMpWmg/UbIwB4hmIBUORLGT0Kf/Fi+6M6DK0UHGerJyYOl7m9WE1n3NMUWDH2wnsY 25kOHu0qyQhcu+iw0zAbKzNcUObEyuQcDSf24DIOz/8XVk5BijP5s+CUcLzdJFxchXsw cOa5AOW8b+Dyz0VSuOmMWho8mt12jnglUFpTTOqA0YjbEcQSS6lCHTVWUqeMH9gT84QA pYr03DS6mvuRjWfJ4CLB3TCOfz0/KVWKOCP5QXkkFW5fjHPu37E9m0VbfsQ3VgHzbUqR Ls/Ruko8gsy8VGYfnws80vkC3WrBWup8KjRyI/jPQ5IQSTYnAkSfeg2rFVCI+NZ77BmA H9iw== Received: by 10.50.207.106 with SMTP id lv10mr1330878igc.0.1347590534726; Thu, 13 Sep 2012 19:42:14 -0700 (PDT) X-Forwarded-To: linaro-patchwork@canonical.com X-Forwarded-For: patch@linaro.org linaro-patchwork@canonical.com Delivered-To: patches@linaro.org Received: by 10.50.184.232 with SMTP id ex8csp166362igc; Thu, 13 Sep 2012 19:42:13 -0700 (PDT) Received: by 10.216.200.201 with SMTP id z51mr693539wen.0.1347590532882; Thu, 13 Sep 2012 19:42:12 -0700 (PDT) Received: from indium.canonical.com (indium.canonical.com. [91.189.90.7]) by mx.google.com with ESMTPS id c40si251319wej.9.2012.09.13.19.42.12 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 13 Sep 2012 19:42:12 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of bounces@canonical.com designates 91.189.90.7 as permitted sender) client-ip=91.189.90.7; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of bounces@canonical.com designates 91.189.90.7 as permitted sender) smtp.mail=bounces@canonical.com Received: from ackee.canonical.com ([91.189.89.26]) by indium.canonical.com with esmtp (Exim 4.71 #1 (Debian)) id 1TCLr9-00086l-N8 for ; Fri, 14 Sep 2012 02:42:11 +0000 Received: from ackee.canonical.com (localhost [127.0.0.1]) by ackee.canonical.com (Postfix) with ESMTP id 8EE3DE003A for ; Fri, 14 Sep 2012 02:42:11 +0000 (UTC) MIME-Version: 1.0 X-Launchpad-Project: lava-dispatcher X-Launchpad-Branch: ~linaro-validation/lava-dispatcher/trunk X-Launchpad-Message-Rationale: Subscriber X-Launchpad-Branch-Revision-Number: 383 X-Launchpad-Notification-Type: branch-revision To: Linaro Patch Tracker From: noreply@launchpad.net Subject: [Branch ~linaro-validation/lava-dispatcher/trunk] Rev 383: fix the sdcard mount problem for jb panda tracking and jb snowball Message-Id: <20120914024211.832.91528.launchpad@ackee.canonical.com> Date: Fri, 14 Sep 2012 02:42:11 -0000 Reply-To: noreply@launchpad.net Sender: bounces@canonical.com Errors-To: bounces@canonical.com Precedence: bulk X-Generated-By: Launchpad (canonical.com); Revision="15944"; Instance="launchpad-lazr.conf" X-Launchpad-Hash: 1b81c36cc4a7a09fbdfc97d0689b2347ad6ad079 X-Gm-Message-State: ALoCoQlEz5AiJY2GV57xsTV4zeeYUibWWNGmNCMWNSwxQCJpAf/An0f2oWRf3uuB8FMYk0n1YVLB Merge authors: Yongqin Liu (liuyq0307) Related merge proposals: https://code.launchpad.net/~liuyq0307/lava-dispatcher/fix-sdcard-mount/+merge/124136 proposed by: Yongqin Liu (liuyq0307) review: Approve - Yongqin Liu (liuyq0307) ------------------------------------------------------------ revno: 383 [merge] committer: Yongqin Liu branch nick: lava-dispatcher timestamp: Fri 2012-09-14 10:41:22 +0800 message: fix the sdcard mount problem for jb panda tracking and jb snowball modified: lava_dispatcher/client/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 === modified file 'lava_dispatcher/client/master.py' --- lava_dispatcher/client/master.py 2012-08-28 04:56:24 +0000 +++ lava_dispatcher/client/master.py 2012-09-12 12:15:15 +0000 @@ -226,12 +226,16 @@ # then the sdcard partition will be used as the userdata partition as # before, and so cannot be used here as the sdcard on android sdcard_part_lava = session._client.device_option("sdcard_part_android") - sed_cmd = ("/dev_mount sdcard \/mnt\/sdcard/c dev_mount sdcard " - "/mnt/sdcard %s /devices/platform/omap/omap_hsmmc.0/" - "mmc_host/mmc0") % sdcard_part_lava + sdcard_part_org = session._client.device_option( + "sdcard_part_android_org") + original = 'dev_mount sdcard /mnt/sdcard %s ' % sdcard_part_org + replacement = 'dev_mount sdcard /mnt/sdcard %s ' % sdcard_part_lava + sed_cmd = "s@{original}@{replacement}@".format(original=original, + replacement=replacement) session.run( 'sed -i "%s" /mnt/lava/system/etc/vold.fstab' % sed_cmd, failok=True) + session.run("cat /mnt/lava/system/etc/vold.fstab", failok=True) script_path = '%s/%s' % ('/mnt/lava', '/system/bin/disablesuspend.sh') if not session.is_file_exist(script_path):