commit 16c4bf429ad7797ac8a2a30cf17d00f0f474fe21
author Liam McLoughlin <lmcloughlin@chromium.org> Wed Nov 28 20:04:01 2012
committer Gerrit <chrome-bot@google.com> Mon Dec 17 13:20:29 2012
tree ee6ab7262f26d6043ce532e2a82da9d7ca6f74bd
parent 5b30bea272c97bd5553c1c23a4a63b3c48c84f80

Modify make_factory_package to use new partitioning scripts

BUG=chrome-os-partner:16170
TEST=Run with --diskimg, dd resulting image to SSD, verify boots

Change-Id: Ie72a96b2361138b97ca7b0d5654997496d2dada2
Reviewed-on: https://gerrit.chromium.org/gerrit/38833
Reviewed-by: Hung-Te Lin <hungte@chromium.org>
Commit-Ready: Liam McLoughlin <lmcloughlin@chromium.org>
Tested-by: Liam McLoughlin <lmcloughlin@chromium.org>

setup/make_factory_package.sh

diff --git a/setup/make_factory_package.sh b/setup/make_factory_package.sh
index dbfae7c..53af9e4 100755
--- a/setup/make_factory_package.sh
+++ b/setup/make_factory_package.sh
@@ -326,7 +326,6 @@
 prepare_img() {
   local outdev="$(readlink -f "$FLAGS_diskimg")"
   local sectors="$FLAGS_sectors"
-  local force_full="true"
 
   # We'll need some code to put in the PMBR, for booting on legacy BIOS.
   echo "Fetch PMBR"
@@ -350,7 +349,38 @@
 
   # Create GPT partition table.
   locate_gpt
-  install_gpt "${outdev}" 0 0 "${pmbrcode}" 0 "${force_full}"
+
+  local root_fs_dir="$(mktemp -d --tmpdir)"
+  local write_gpt_path="${root_fs_dir}/usr/sbin/write_gpt.sh"
+
+  image_add_temp "${root_fs_dir}"
+  image_mount_partition "${FLAGS_release}" "3" "${root_fs_dir}" "ro" "-t ext2"
+
+  if [ ! -f "${write_gpt_path}" ]; then
+    die "This script no longer works on legacy images without write_gpt.sh"
+  fi
+
+  # We need to patch up write_gpt.sh a bit to cope with the fact we're
+  # running in a non-chroot/device env and that we're not running as root
+  local outdev_block=$(sudo losetup -f --show "${outdev}")
+  local partition_script="$(mktemp --tmpdir)"
+  image_add_temp "${partition_script}"
+
+  cat "${write_gpt_path}" > "${partition_script}"
+  echo write_base_table "${outdev_block}" "${pmbrcode}" >> "${partition_script}"
+
+  # Fix path to chromeos-common.sh
+  sed -i 's"/usr/sbin/chromeos-common.sh"lib/chromeos-common.sh"g' \
+    "${partition_script}"
+
+  # Add local bin to PATH before running locate_gpt
+  sed -i 's,locate_gpt,PATH="'"$PATH"'";locate_gpt,g' "${partition_script}"
+
+  sudo bash "${partition_script}"
+
+  sudo losetup -d "${outdev_block}"
+  image_umount_partition "${root_fs_dir}"
+
   # Activate the correct partition.
   sudo "${GPT}" add -i 2 -S 1 -P 1 "${outdev}"
 }