commit 8e66534e4c76de1b2882ef637cdb8f3c361cb48f
author Alex Deymo <deymo@chromium.org> Wed Jul 01 01:54:54 2015 +0000
committer ChromeOS Commit Bot <chromeos-commit-bot@chromium.org> Wed Jul 01 05:27:51 2015 +0000
tree c543fc43e18df9bbae8fc4b9ba9eb98889c8014e
parent 00d79acf5b081e80978fb0e07caeae77b99f0372

Revert "update_engine: Change the default chunk_size to 200MB"

The chunk_size handling in payload_generator has some problems. This commit break the full payload generation due to some bugs when the chunk_size is not a divisor of the partition size, breaking paygen in canaries.

This patch is not required for chromium:504447 since the bzip2 bug was already fixed.

This reverts commit def5fe30d2c5f38915f4e5986bdc54661f20ec3e.

BUG=chromium:504447
TEST=cros_generate_update_payload for a full payload doesn't generate a 200MiB kernel image.

Change-Id: I505afd84ca10c7256b66cd84f288c6db03a4d88e
Reviewed-on: https://chromium-review.googlesource.com/282767
Reviewed-by: Alex Deymo <deymo@chromium.org>
Commit-Queue: Alex Deymo <deymo@chromium.org>
Trybot-Ready: Alex Deymo <deymo@chromium.org>
Tested-by: Alex Deymo <deymo@chromium.org>

payload_generator/generate_delta_main.cc

diff --git a/payload_generator/generate_delta_main.cc b/payload_generator/generate_delta_main.cc
index 9a8e27d..7f7b2b8 100644
--- a/payload_generator/generate_delta_main.cc
+++ b/payload_generator/generate_delta_main.cc
@@ -252,8 +252,7 @@
                 "e.g. /path/to/sig:/path/to/next:/path/to/last_sig . Each "
                 "signature will be assigned a client version, starting from "
                 "kSignatureOriginalVersion.");
-  DEFINE_int32(chunk_size, 200 * 1024 * 1024,
-                "Payload chunk size (-1 -- no limit/default)");
+  DEFINE_int32(chunk_size, -1, "Payload chunk size (-1 -- no limit/default)");
   DEFINE_uint64(rootfs_partition_size,
                chromeos_update_engine::kRootFSPartitionSize,
                "RootFS partition size for the image once installed");