From fc752ffdfa47ce59ecf40319b36ad5fc296e811e Mon Sep 17 00:00:00 2001
From: Bill Richardson <wfrichar@chromium.org>
Date: Fri, 11 Jun 2010 09:16:09 -0700
Subject: [PATCH] Use new cgpt tool when creating images and the pack/unpack
 scripts.

Review URL: http://codereview.chromium.org/2792011
---
 chromeos_version.sh | 5 +++--
 emit_gpt_scripts.sh | 7 +++----
 mount_gpt_image.sh  | 1 +
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/chromeos_version.sh b/chromeos_version.sh
index 3f9d2830e9..94bb2b1cff 100755
--- a/chromeos_version.sh
+++ b/chromeos_version.sh
@@ -87,6 +87,7 @@ export CHROME_BASE=
 # directory containing chrome-chromeos.zip - an svn rev or a full version
 export CHROME_BUILD=
 
-# Print version info.
+# Print (and remember) version info.
 echo "ChromeOS version information:"
-env | egrep '^CHROMEOS_VERSION|CHROME_' | sed 's/^/    /'
+logvers="/tmp/version_${CHROMEOS_VERSION_STRING}"
+env | egrep '^CHROMEOS_VERSION|CHROME_' | tee $logvers | sed 's/^/    /'
diff --git a/emit_gpt_scripts.sh b/emit_gpt_scripts.sh
index b16e4b3a42..12e3629f1b 100755
--- a/emit_gpt_scripts.sh
+++ b/emit_gpt_scripts.sh
@@ -26,7 +26,7 @@ UNPACK="${DIR}/unpack_partitions.sh"
 locate_gpt
 
 TMP=$(mktemp)
-sudo $GPT -r show -l "$IMAGE" > $TMP
+$GPT show "$IMAGE" > $TMP
 
 HEADER='#!/bin/sh -eu
 # File generated by emit_gpt_scripts.sh. Do not edit.
@@ -42,9 +42,8 @@ echo "$HEADER" > "$UNPACK"
 cat $TMP | sed -e 's/^/# /' >> "$PACK"
 cat $TMP | sed -e 's/^/# /' >> "$UNPACK"
 
-sort -n -k 3 $TMP | \
-  grep 'GPT part -' | \
-  while read start size part x x x label x; do \
+$GPT show -q "$IMAGE" | \
+  while read start size part x; do \
     file="part_$part"
     loc="\"\$TARGET\""
     echo "dd if=$loc of=$file bs=512 skip=$start count=$size" \
diff --git a/mount_gpt_image.sh b/mount_gpt_image.sh
index 64e2a4034d..9d9785a158 100755
--- a/mount_gpt_image.sh
+++ b/mount_gpt_image.sh
@@ -11,6 +11,7 @@
 
 # For functions related to gpt images.
 . "$(dirname "$0")/chromeos-common.sh"
+locate_gpt
 
 get_default_board