commit b57a9d3d48e9b76a35137b77b003718f5ad6b41f
author Douglas Anderson <dianders@chromium.org> Tue Jun 04 13:50:17 2019 -0700
committer chrome-bot <chrome-bot@chromium.org> Tue Jun 25 14:34:25 2019 -0700
tree f739ed22b1939e7692ea06a4d3a6e671fb072a79
parent 4d12cf9c77d0864f3a583f3693b77ac3a46b28c5

update_kernel: Only copy stuff in /boot if doing syslinux

In normal Chrome OS flows (other than the syslinux flow), we don't use
"/boot" for booting the system.  Normally Chrome OS loads the kernel
from the kernel partition (KERN-A or KERN-B).

Copying stuff in /boot just takes extra time and disk space.  Let's
not do it.

After this change, I find myself running out of disk space much less
frequently when running update_kernel (assuming I pass --nosyslinux).

BUG=None
TEST=Try with and without the "--nosyslinux" flag.

Change-Id: I7da96595233459c4c1315248db572252cb7891ee
Signed-off-by: Douglas Anderson <dianders@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/1644051
Legacy-Commit-Queue: Commit Bot <commit-bot@chromium.org>
Reviewed-by: Brian Norris <briannorris@chromium.org>
Reviewed-by: Guenter Roeck <groeck@chromium.org>

update_kernel.sh

diff --git a/update_kernel.sh b/update_kernel.sh
index 9df714c..2a902f1 100755
--- a/update_kernel.sh
+++ b/update_kernel.sh
@@ -22,7 +22,7 @@
 DEFINE_boolean ignore_verity $FLAGS_FALSE "Update kernel even if system is using verity"
 DEFINE_boolean reboot $FLAGS_TRUE "Reboot system after update"
 DEFINE_boolean vboot $FLAGS_TRUE "Update the vboot kernel"
-DEFINE_boolean syslinux $FLAGS_TRUE "Update the syslinux kernel"
+DEFINE_boolean syslinux $FLAGS_TRUE "Update the syslinux kernel (including /boot)"
 DEFINE_boolean bootonce $FLAGS_FALSE "Mark kernel partition as boot once"
 DEFINE_boolean remote_bootargs $FLAGS_FALSE "Use bootargs from running kernel on target"
 DEFINE_boolean firmware $FLAGS_FALSE "Also update firmwares (/lib/firmware)"
@@ -211,7 +211,6 @@
   # ARM does not have the syslinux directory, so skip it when the
   # partition is missing, the file system fails to mount, or the syslinux
   # vmlinuz target is missing.
-  echo "updating syslinux kernel"
   remote_sh grep $(echo ${FLAGS_device}${PARTITION_NUM_EFI_SYSTEM} | cut -d/ -f3) /proc/partitions
   if [ $(echo "$REMOTE_OUT" | wc -l) -eq 1 ]; then
     remote_sh mkdir -p /tmp/${PARTITION_NUM_EFI_SYSTEM}
@@ -292,11 +291,13 @@
     else
       remote_sh mount -o remount,rw /
     fi
-    echo "copying kernel"
-    remote_send_to /build/"${FLAGS_board}"/boot/ "${remote_basedir}"/boot/
 
-    if [ ${FLAGS_syslinux} -eq ${FLAGS_TRUE} ]; then
+    if [[ ${FLAGS_syslinux} -eq ${FLAGS_TRUE} ]]; then
+      info "Copying syslinux and /boot"
+      remote_send_to /build/"${FLAGS_board}"/boot/ "${remote_basedir}"/boot/
       update_syslinux_kernel
+    else
+      info "Skipping syslinux and /boot (per request)"
     fi
 
     copy_kernelmodules "${remote_basedir}"