From patchwork Wed Apr 24 11:27:17 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Senthil Kumaran X-Patchwork-Id: 16372 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-vc0-f199.google.com (mail-vc0-f199.google.com [209.85.220.199]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 6A8C723918 for ; Wed, 24 Apr 2013 11:28:10 +0000 (UTC) Received: by mail-vc0-f199.google.com with SMTP id gf11sf582447vcb.2 for ; Wed, 24 Apr 2013 04:27:19 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-received:x-beenthere:x-received:received-spf:x-received :x-forwarded-to:x-forwarded-for:delivered-to:x-received:received-spf :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:x-original-sender :x-original-authentication-results:mailing-list:list-id :x-google-group-id:list-post:list-help:list-archive:list-unsubscribe :content-type; bh=rgxgFqtBY1X1nrVyeyIlVuA9Satzbf09Q2rdRrFY8OI=; b=IjEqB97HsRioHGkqAQMUqWKtLs30Lcv3hAhDa7HidEI7sl00F719qAT3n8TfczWjph Rn24uI22WoT/LBdJEOPfxGWIy9i2NUhRd18i61s612uzHmwmrl8Ac0Khcg6SBPcyWjb7 rxT2wxwTcfblZAlrnVVgWCOHB/MJEZPbUv/MU2p7qU3JvKG9lBz18Otsh0x1ebSj+W/4 qpHyeEesC5y8V3q6+3Pcs/ZDj0W76O6JNO9Dg4oEvj/JsHeAe+cxMOlSc5ahZuVX/3T1 07vIII6+hkvp0GjqZcXePwJwduceJLCDsgQP8AJGmkonLRuWzCv3Mzf4gdlTtAEnL5yJ dKrA== X-Received: by 10.236.32.67 with SMTP id n43mr17332094yha.0.1366802839520; Wed, 24 Apr 2013 04:27:19 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.49.130.227 with SMTP id oh3ls821938qeb.57.gmail; Wed, 24 Apr 2013 04:27:19 -0700 (PDT) X-Received: by 10.52.119.175 with SMTP id kv15mr20942635vdb.23.1366802839390; Wed, 24 Apr 2013 04:27:19 -0700 (PDT) Received: from mail-ve0-x22a.google.com (mail-ve0-x22a.google.com [2607:f8b0:400c:c01::22a]) by mx.google.com with ESMTPS id e5si1065357vcu.42.2013.04.24.04.27.19 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 24 Apr 2013 04:27:19 -0700 (PDT) Received-SPF: neutral (google.com: 2607:f8b0:400c:c01::22a is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=2607:f8b0:400c:c01::22a; Received: by mail-ve0-f170.google.com with SMTP id 15so670683vea.1 for ; Wed, 24 Apr 2013 04:27:19 -0700 (PDT) X-Received: by 10.52.71.4 with SMTP id q4mr21117489vdu.8.1366802839278; Wed, 24 Apr 2013 04:27:19 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patches@linaro.org Received: by 10.58.127.98 with SMTP id nf2csp168796veb; Wed, 24 Apr 2013 04:27:18 -0700 (PDT) X-Received: by 10.194.93.133 with SMTP id cu5mr67993663wjb.56.1366802838329; Wed, 24 Apr 2013 04:27:18 -0700 (PDT) Received: from indium.canonical.com (indium.canonical.com. [91.189.90.7]) by mx.google.com with ESMTPS id b4si7552821wie.42.2013.04.24.04.27.17 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Wed, 24 Apr 2013 04:27:18 -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; Received: from ackee.canonical.com ([91.189.89.26]) by indium.canonical.com with esmtp (Exim 4.71 #1 (Debian)) id 1UUxr3-0003ZI-P8 for ; Wed, 24 Apr 2013 11:27:17 +0000 Received: from ackee.canonical.com (localhost [127.0.0.1]) by ackee.canonical.com (Postfix) with ESMTP id ACF08E0122 for ; Wed, 24 Apr 2013 11:27:17 +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: 587 X-Launchpad-Notification-Type: branch-revision To: Linaro Patch Tracker From: noreply@launchpad.net Subject: [Branch ~linaro-validation/lava-dispatcher/trunk] Rev 587: Fix bug #1172235 - snowball does not boot due to wrong partition during Message-Id: <20130424112717.28888.73498.launchpad@ackee.canonical.com> Date: Wed, 24 Apr 2013 11:27:17 -0000 Reply-To: noreply@launchpad.net Sender: bounces@canonical.com Errors-To: bounces@canonical.com Precedence: list X-Generated-By: Launchpad (canonical.com); Revision="16580"; Instance="launchpad-lazr.conf" X-Launchpad-Hash: 6c809112376f137a001b07762efbf52a26bf4b75 X-Gm-Message-State: ALoCoQlYMX6Vixq3HVRJ4Hmf0JXhhzzJI30B9zw3ph78iEN5r8JaUISkWHDTSyr9k+1B3M9gpW1Y X-Original-Sender: noreply@launchpad.net X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 2607:f8b0:400c:c01::22a is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org List-ID: X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , Merge authors: Senthil Kumaran S (stylesen) Related merge proposals: https://code.launchpad.net/~stylesen/lava-dispatcher/fix-bug-1172235/+merge/160607 proposed by: Senthil Kumaran S (stylesen) review: Approve - Dave Pigott (dpigott) ------------------------------------------------------------ revno: 587 [merge] committer: Senthil Kumaran branch nick: trunk timestamp: Wed 2013-04-24 16:55:50 +0530 message: Fix bug #1172235 - snowball does not boot due to wrong partition during untangling of boot commands. 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 === 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:09:03 +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\d+)\s+" boot_cmds = re.sub( pattern, self._rewrite_partition_number, boot_cmds, re.MULTILINE)