From ca9b334e8e032a4db806081c660eeb31cd331b4c Mon Sep 17 00:00:00 2001
From: Zdenek Behan <zbehan@chromium.org>
Date: Fri, 4 Feb 2011 23:44:15 +0100
Subject: [PATCH] Revert "cros_generate_update_payload: kill old style update
 image generation"

This reverts commit fad7fecc4d7a9f39efd88110ddcae85e7242830a.

BUG=n0ne
TEST=

Review URL: http://codereview.chromium.org/6246073

Change-Id: I7652b57145931b9d6ed85d82f648eb6f5dc35ae2
---
 cros_generate_update_payload | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/cros_generate_update_payload b/cros_generate_update_payload
index 586b2f8f23..b55f438526 100755
--- a/cros_generate_update_payload
+++ b/cros_generate_update_payload
@@ -247,11 +247,6 @@ if [ "$DELTA" -eq "$FLAGS_TRUE" -o "$FLAGS_old_style" -eq "$FLAGS_FALSE" ]; then
 else
   echo "Generating old-style full update"
 
-  # TODO(zbehan): Remove this branch entirely and disable the cmdline option.
-  echo "This is a deprecated and unused behaviour. It also introduces unwanted"
-  echo "dependency to a third script (mk_memento_images) which has become broken."
-  exit 1
-
   trap cleanup INT TERM EXIT
   DST_KERNEL=$(extract_partition_to_temp_file "$FLAGS_image" 2)
   if [ "$FLAGS_patch_kernel" -eq "$FLAGS_TRUE" ]; then
@@ -259,7 +254,7 @@ else
   fi
   DST_ROOT=$(extract_partition_to_temp_file "$FLAGS_image" 3)
 
-#  GENERATOR="${SCRIPTS_DIR}/mk_memento_images.sh"
+  GENERATOR="${SCRIPTS_DIR}/mk_memento_images.sh"
 
   CROS_GENERATE_UPDATE_PAYLOAD_CALLED=1 "$GENERATOR" "$DST_KERNEL" "$DST_ROOT"
   mv "$(dirname "$DST_KERNEL")/update.gz" "$FLAGS_output"