Remove old logic ... and don't needlessly modifiy dev image.

archive_build.sh

Index: archive_build.sh
diff --git a/archive_build.sh b/archive_build.sh
index 94630059fd0017fee87bd6c25aa55f44a4fbe5c4..414f37b4295b4a3639de1af18bea6a25e87f2a92 100755
--- a/archive_build.sh
+++ b/archive_build.sh
@@ -140,7 +140,6 @@ mkdir -p "$OUTDIR"
 
 
 SRC_IMAGE="${FLAGS_from}/chromiumos_image.bin"

[sjg, 2011/02/15 15:19:42]

You can use ${CHROMEOS_IMAGE_NAME} here if you like.

[sosa, 2011/02/15 22:08:12]

Done.

-BACKUP_IMAGE="${FLAGS_from}/chromiumos_image_bkup.bin"
 
 # Apply mod_image_for_test to the developer image, and store the
 # result in a new location. Usage:
@@ -148,11 +147,8 @@ BACKUP_IMAGE="${FLAGS_from}/chromiumos_image_bkup.bin"
 function do_chroot_mod() {
   MOD_ARGS=$2
   OUTPUT_IMAGE=$1

[sjg, 2011/02/15 15:19:42]

Great, a use for --noinplace.

I think this function could go away - $1 is not used and $2 is blank!

Also you might find that you can use prepare_test_image() here (from common.sh).

But given that you are already cleaning up code, I'm happy to LGTM if this is as
far as you want to go.

[sosa, 2011/02/15 22:08:12]

See note.  Still want in place but I need the mv's for Factory images

On 2011/02/15 15:19:42, sjg wrote:

-  cp -f "${SRC_IMAGE}" "${BACKUP_IMAGE}"
   ./enter_chroot.sh -- ./mod_image_for_test.sh --board $FLAGS_board \
-      --yes ${MOD_ARGS}
-  mv "${SRC_IMAGE}" "${OUTPUT_IMAGE}"
-  mv "${BACKUP_IMAGE}" "${SRC_IMAGE}"
+      --yes --noinplace ${MOD_ARGS}
 }
 
 # Modify image for test if flag set.