commit 8b2520c765031258d3d8529cf4a451f8d1a955e3
author Gabe Black <gabeblack@chromium.org> Thu Aug 21 07:06:54 2014
committer chrome-internal-fetch <chrome-internal-fetch@google.com> Mon Aug 25 06:47:29 2014
tree 68d2d7d3c8a3df9b88b3096f92e84e433e6d3ce6
parent fe4aaafa56924bb1cefe98829ec0cd37693b4cf9

factory_install: Remove kernel post processing.

The "release" kernel should now have a valid vblock in it without having to
copy over the one in the stateful partition which is being deprecated.

BUG=chromium:403031
TEST=emerge-lumpy chromeos-factoryinstall

Change-Id: I57f52d7e94a5e27889cdfbeb0b6d706061512f0f
Reviewed-on: https://chromium-review.googlesource.com/213450
Reviewed-by: Hung-Te Lin <hungte@chromium.org>
Commit-Queue: Gabe Black <gabeblack@chromium.org>
Tested-by: Gabe Black <gabeblack@chromium.org>

au_download/recover_from_server.cc

diff --git a/au_download/recover_from_server.cc b/au_download/recover_from_server.cc
index 6733369..8254d49 100644
--- a/au_download/recover_from_server.cc
+++ b/au_download/recover_from_server.cc
@@ -311,52 +311,12 @@
   }
 }
 
-void postprocess_release(const string& stateful_mount)
-{
-  const string kVmlinuzHdFile="vmlinuz_hd.vblock";
-  string image_path = stateful_mount + kImagePath;
-  char mount_template[] = "image_XXXXXX";
-  string image_mount(mkdtemp(mount_template));
-  image_mount += "/";
-
-  // Find of the location of stateful partition
-  int begin_sector = get_image_offset(kStatefulPartition, image_path);
-  int num_sectors = get_image_size(kStatefulPartition, image_path);
-
-  stringstream command;
-  command << "mount -o loop,offset=" << (uint64_t) begin_sector * 512 <<
-             ",sizelimit=" << (uint64_t) num_sectors * 512 << ",ro" <<
-             " " << image_path << " " << image_mount;
-  cerr << command.str() << endl;
-  if (system(command.str().c_str()) != 0) {
-    error_exit("Cannot mount stateful partition from image");
-  }
-
-  command.str(string());
-  string kernel_device = get_output_device(kRealKernel);
-  command << "dd if=" << image_mount << kVmlinuzHdFile <<
-             " of=" << kernel_device << " bs=512 conv=notrunc";
-  if (system(command.str().c_str()) != 0) {
-    error_exit("Cannot update kernel with " + kVmlinuzHdFile);
-  }
-
-  if (system(("umount " + image_mount).c_str()) != 0) {
-    error_exit("Cannot umount " + image_mount);
-  }
-  if (remove(image_mount.c_str()) != 0){
-    error_exit("Cannot remove " + image_mount);
-  }
-}
-
 void install_all_partition(const string& stateful_mount)
 {
   install_partition(stateful_mount, kRecoveryKernel, kRealKernel);
   install_partition(stateful_mount, kRootfsPartition);
   install_partition(stateful_mount, kOemPartition);
   install_partition(stateful_mount, kEfiPartition);
-  // Since we use release image, we need to copy vmlinuz_hd.block from
-  // stateful partition to kernel partition.
-  postprocess_release(stateful_mount);
 }
 
 int main()