From be4f08d4fb6e0e0c438a279f0d16e965cd551294 Mon Sep 17 00:00:00 2001
From: "abarth@webkit.org"
 <abarth@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Mon, 2 Jul 2012 00:08:17 +0000
Subject: [PATCH] Unreviewed.

It turns out we need to use Ubuntu 10.04 to get the right image results
for chromium-linux. This patch updates our scripts to be compatible
with Ubuntu 10.04.

* EWSTools/cold-boot.sh:
    - fdisk doesn't have p and 1 as default commands in 10.04.
* EWSTools/start-queue.sh:
    - git doesn't understanding the -B argument in 10.04. We've been
      using this change locally on the EC2 bots for a while.


git-svn-id: http://svn.webkit.org/repository/webkit/trunk@121644 268f45cc-cd09-0410-ab3c-d52691b4dbfc
---
 Tools/ChangeLog               | 14 ++++++++++++++
 Tools/EWSTools/cold-boot.sh   |  4 ++--
 Tools/EWSTools/start-queue.sh |  4 +++-
 3 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/Tools/ChangeLog b/Tools/ChangeLog
index d004802..cd73c73 100644
--- a/Tools/ChangeLog
+++ b/Tools/ChangeLog
@@ -2,6 +2,20 @@
 
         Unreviewed.
 
+        It turns out we need to use Ubuntu 10.04 to get the right image results
+        for chromium-linux. This patch updates our scripts to be compatible
+        with Ubuntu 10.04.
+
+        * EWSTools/cold-boot.sh:
+            - fdisk doesn't have p and 1 as default commands in 10.04.
+        * EWSTools/start-queue.sh:
+            - git doesn't understanding the -B argument in 10.04. We've been
+              using this change locally on the EC2 bots for a while.
+
+2012-07-01  Adam Barth  <abarth@webkit.org>
+
+        Unreviewed.
+
         * EWSTools/boot.sh:
             - We need to start the screen in detached mode so that we can run
               it remotely via ssh.
diff --git a/Tools/EWSTools/cold-boot.sh b/Tools/EWSTools/cold-boot.sh
index 821ebc4..7a90c40 100755
--- a/Tools/EWSTools/cold-boot.sh
+++ b/Tools/EWSTools/cold-boot.sh
@@ -35,8 +35,8 @@ fi
 # Format the disk
 cat <<EOF | sudo fdisk /dev/vdb
 n
-
-
+p
+1
 
 
 w
diff --git a/Tools/EWSTools/start-queue.sh b/Tools/EWSTools/start-queue.sh
index 2f817e3..801de99 100755
--- a/Tools/EWSTools/start-queue.sh
+++ b/Tools/EWSTools/start-queue.sh
@@ -38,7 +38,9 @@ do
   git clean -f # Remove any left-over layout test results, added files, etc.
   git rebase --abort # If we got killed during a git rebase, we need to clean up.
   git fetch origin # Avoid updating the working copy to a stale revision.
-  git checkout origin/master -fB master # Re-create master from origin/master.
+  git checkout origin/master -f
+  git branch -D master
+  git checkout origin/master -b master
 
   # Most queues auto-update as part of their normal operation, but updating
   # here makes sure that we get the latest version of the master process.
-- 
2.7.4