From patchwork Thu Mar 22 23:30:16 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul Larson X-Patchwork-Id: 7425 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 8EC4923DEA for ; Thu, 22 Mar 2012 23:30: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 20C18A18883 for ; Thu, 22 Mar 2012 23:30:20 +0000 (UTC) Received: by iage36 with SMTP id e36so5025823iag.11 for ; Thu, 22 Mar 2012 16:30:19 -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=A5nn3ukCEEck9KsVPhQZUUfUhX+1cDPNIEcshTJhU64=; b=hXt3ghO0+pmJRPBYd7Ov2suBwHsEJ+Uuhl0KlvM68sYnSJnhH055Zhfrv2OY+2I0HK 7ABFbxKmxTKOPgeWKq1BuSfMZAIKYdvjsKaZjKRKI+s/JuwRwJ/A9RKy/BncmCkDrLsa qyhRr47kgcGivUiW8G0eQ6NJCo62yAsLUo8Q6n+NzhzhL6ZSQxvXzmfJzBiMok645lQO wk1nuXsN4sLZQ1M7IdR+36nIkfKfmhBgGU4+Za5XZb1GWOCqle3tQ8DZ11b7TQ7Mrj4x bOisBuH+t5c3NGyC+tdtp2U7chNxqrRGxOxQWsW15Ksrl4+2v4XanYJoTY7p3NEFdTY7 QhnA== Received: by 10.42.72.130 with SMTP id o2mr7090639icj.8.1332459019544; Thu, 22 Mar 2012 16:30:19 -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.231.203.79 with SMTP id fh15csp9599ibb; Thu, 22 Mar 2012 16:30:18 -0700 (PDT) Received: by 10.216.135.105 with SMTP id t83mr5586032wei.105.1332459018017; Thu, 22 Mar 2012 16:30:18 -0700 (PDT) Received: from indium.canonical.com (indium.canonical.com. [91.189.90.7]) by mx.google.com with ESMTPS id t9si6788049wec.115.2012.03.22.16.30.16 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 22 Mar 2012 16:30:17 -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 1SArSS-0003sh-Nt for ; Thu, 22 Mar 2012 23:30:16 +0000 Received: from ackee.canonical.com (localhost [127.0.0.1]) by ackee.canonical.com (Postfix) with ESMTP id A9BD7E0123 for ; Thu, 22 Mar 2012 23:30:16 +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: 261 X-Launchpad-Notification-Type: branch-revision To: Linaro Patch Tracker From: noreply@launchpad.net Subject: [Branch ~linaro-validation/lava-dispatcher/trunk] Rev 261: minor corrections to lava-partition-disk Message-Id: <20120322233016.4314.85662.launchpad@ackee.canonical.com> Date: Thu, 22 Mar 2012 23:30:16 -0000 Reply-To: noreply@launchpad.net Sender: bounces@canonical.com Errors-To: bounces@canonical.com Precedence: bulk X-Generated-By: Launchpad (canonical.com); Revision="14981"; Instance="launchpad-lazr.conf" X-Launchpad-Hash: 67ba35843e68c5ce317b2a5cd3d80393ee3d2fe8 X-Gm-Message-State: ALoCoQn6NfO0zlQ5RXNkzdaLtn8kPm9wtyEm5qfb8ESbukxhQbNO3SafuGJGGPWMueg27x21JA0M Merge authors: Zygmunt Krynicki (zkrynicki) Related merge proposals: https://code.launchpad.net/~zkrynicki/lava-dispatcher/update-daves-script/+merge/98908 proposed by: Zygmunt Krynicki (zkrynicki) review: Approve - Michael Hudson-Doyle (mwhudson) ------------------------------------------------------------ revno: 261 [merge] committer: Paul Larson branch nick: lava-dispatcher timestamp: Thu 2012-03-22 18:28:21 -0500 message: minor corrections to lava-partition-disk modified: doc/scripts/lava-partition-disk --- 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 'doc/scripts/lava-partition-disk' --- doc/scripts/lava-partition-disk 2012-03-07 10:39:25 +0000 +++ doc/scripts/lava-partition-disk 2012-03-19 12:18:42 +0000 @@ -2,57 +2,58 @@ if [ "$1" = "" ] then - DEVICE="/dev/sdb" + echo "Usage: $0 DEVICE" + exit 1 else - DEVICE=$1 + DEVICE=$1 fi if [ "$2" = "" ] then -# SIZE is the size of the testrootfs partition. On an 8G sd you can fit -# 4G - put it up to 8G on a 16GB. The rest is allocated to sdcard for -# android - SIZE="4G" + # SIZE is the size of the testrootfs partition. On an 8G sd you can fit + # 4G - put it up to 8G on a 16GB. The rest is allocated to sdcard for + # android + SIZE="4G" else - SIZE=$2 + SIZE=$2 fi if [ "$3" = "" ] then - SCHEME="2part" + SCHEME="2part" else - SCHEME=$3 + SCHEME=$3 fi # origen has a different original layout with 3 partitions - all others are the same (so far) if [ $SCHEME = "2part" ] then - TESTBOOT_PART=3 - TESTROOTFS_PART=5 - SDCARD_PART=6 - LAST_BLOCK=2 + TESTBOOT_PART=3 + TESTROOTFS_PART=5 + SDCARD_PART=6 + LAST_BLOCK=2 else - TESTBOOT_PART=5 - TESTROOTFS_PART=6 - SDCARD_PART=7 - LAST_BLOCK=3 + TESTBOOT_PART=5 + TESTROOTFS_PART=6 + SDCARD_PART=7 + LAST_BLOCK=3 fi FIRST_BLOCK_START=`sudo fdisk -S 63 -H 255 -lc $DEVICE | grep "$DEVICE$LAST_BLOCK" | awk '{print $3 + 1}'` if [ "$FIRST_BLOCK_START" = "" ] then - echo "Device specification error: $DEVICE" - exit 1 + echo "Device specification error: $DEVICE" + exit 1 fi if [ $SCHEME = "2part" ] then - EXTENDED_BLOCK_START=`echo $FIRST_BLOCK_START | awk '{print $1 + 131072}'` - FDISK_SCRIPT="n\np\n3\n$FIRST_BLOCK_START\n+64M\nt\n3\nc\nn\ne\n$EXTENDED_BLOCK_START\n\nn\n\n+$SIZE\nn\n\n\nt\n6\nc\np\nw\n" + EXTENDED_BLOCK_START=`echo $FIRST_BLOCK_START | awk '{print $1 + 131072}'` + FDISK_SCRIPT="n\np\n3\n$FIRST_BLOCK_START\n+64M\nt\n3\nc\nn\ne\n$EXTENDED_BLOCK_START\n\nn\n\n+$SIZE\nn\n\n\nt\n6\nc\np\nw\n" else - FDISK_SCRIPT="n\ne\n$FIRST_BLOCK_START\n\nn\n\n+64M\nt\n5\nc\nn\n\n+$SIZE\nn\n\n\nt\n7\nc\np\nw\n" + FDISK_SCRIPT="n\ne\n$FIRST_BLOCK_START\n\nn\n\n+64M\nt\n5\nc\nn\n\n+$SIZE\nn\n\n\nt\n7\nc\np\nw\n" fi echo -e $FDISK_SCRIPT | sudo fdisk -S 63 -H 255 -c $DEVICE