From patchwork Wed Jan 18 00:07:18 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul Larson X-Patchwork-Id: 6274 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 7FD4323F02 for ; Wed, 18 Jan 2012 00:07:21 +0000 (UTC) Received: from mail-bk0-f52.google.com (mail-bk0-f52.google.com [209.85.214.52]) by fiordland.canonical.com (Postfix) with ESMTP id 44736A181D4 for ; Wed, 18 Jan 2012 00:07:21 +0000 (UTC) Received: by bkbzt4 with SMTP id zt4so2424217bkb.11 for ; Tue, 17 Jan 2012 16:07:21 -0800 (PST) Received: by 10.205.141.72 with SMTP id jd8mr3116811bkc.135.1326845240729; Tue, 17 Jan 2012 16:07:20 -0800 (PST) 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.205.82.144 with SMTP id ac16cs133279bkc; Tue, 17 Jan 2012 16:07:20 -0800 (PST) Received: by 10.180.100.100 with SMTP id ex4mr4807079wib.19.1326845238885; Tue, 17 Jan 2012 16:07:18 -0800 (PST) Received: from indium.canonical.com (indium.canonical.com. [91.189.90.7]) by mx.google.com with ESMTPS id cm4si17291638wib.30.2012.01.17.16.07.18 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 17 Jan 2012 16:07:18 -0800 (PST) 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 1RnJ3e-0002Dv-Ke for ; Wed, 18 Jan 2012 00:07:18 +0000 Received: from ackee.canonical.com (localhost [127.0.0.1]) by ackee.canonical.com (Postfix) with ESMTP id 8FFD1E06D2 for ; Wed, 18 Jan 2012 00:07:18 +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: 194 X-Launchpad-Notification-Type: branch-revision To: Linaro Patch Tracker From: noreply@launchpad.net Subject: [Branch ~linaro-validation/lava-dispatcher/trunk] Rev 194: Avoid boot_linaro_image failure due to a new test image shell prompt Message-Id: <20120118000718.8026.20425.launchpad@ackee.canonical.com> Date: Wed, 18 Jan 2012 00:07:18 -0000 Reply-To: noreply@launchpad.net Sender: bounces@canonical.com Errors-To: bounces@canonical.com Precedence: bulk X-Generated-By: Launchpad (canonical.com); Revision="14681"; Instance="launchpad-lazr.conf" X-Launchpad-Hash: 5b0aa28635282fdd3d9be2478a627ec2bc334950 Merge authors: Spring Zhang (qzhang) Related merge proposals: https://code.launchpad.net/~qzhang/lava-dispatcher/fix-917221/+merge/88724 proposed by: Spring Zhang (qzhang) review: Approve - Paul Larson (pwlars) ------------------------------------------------------------ revno: 194 [merge] committer: Paul Larson branch nick: lava-dispatcher timestamp: Tue 2012-01-17 18:04:46 -0600 message: Avoid boot_linaro_image failure due to a new test image shell prompt modified: lava_dispatcher/default-config/lava-dispatcher/device-defaults.conf --- 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/default-config/lava-dispatcher/device-defaults.conf' --- lava_dispatcher/default-config/lava-dispatcher/device-defaults.conf 2012-01-09 03:16:32 +0000 +++ lava_dispatcher/default-config/lava-dispatcher/device-defaults.conf 2012-01-16 15:57:23 +0000 @@ -74,10 +74,10 @@ sdcard_part_android = 6 # Master image recognization string -MASTER_STR = root@master: +MASTER_STR = root@master # Test image recognization string -TESTER_STR = root@linaro: +TESTER_STR = root@linaro # The character the boot loader uses as a prompt on this board. bootloader_prompt = # @@ -88,4 +88,4 @@ lmc_dev_arg = %(device_type)s # The value to pass to qemu-system-arm's -M option. -qemu_machine_type = %(device_type)s \ No newline at end of file +qemu_machine_type = %(device_type)s