commit fbe444a5717d40aedd81b1d3cc7329acfe6a576a
author Daniil Lunev <dlunev@google.com> Fri Apr 24 21:47:20 2020 +1000
committer Commit Bot <commit-bot@chromium.org> Wed Apr 29 05:06:24 2020 +0000
tree 7184254f58db3431efe6a30dbb41b82a5b0b1575
parent 8c1e1b266498f9101d07be58d69187a8469434a6

Fix the source vmlinuz path during non-active partition kernel upgrade.

BUG=1075824
TEST=Deploy kernel to a device booted from a usb stick.

Change-Id: I4876e67ff2ea482d4d3fed0511d56397830905c7
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/crosutils/+/2163089
Tested-by: Daniil Lunev <dlunev@chromium.org>
Commit-Queue: Daniil Lunev <dlunev@chromium.org>
Reviewed-by: Douglas Anderson <dianders@chromium.org>

update_kernel.sh

diff --git a/update_kernel.sh b/update_kernel.sh
index 73acaf4..44b66f8 100755
--- a/update_kernel.sh
+++ b/update_kernel.sh
@@ -217,6 +217,7 @@
 }
 
 update_syslinux_kernel() {
+  local basedir="$1" # rootfs directory (could be in /tmp) or empty string
   # 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.
@@ -231,7 +232,8 @@
       else
         target="/tmp/${PARTITION_NUM_EFI_SYSTEM}/syslinux/vmlinuz.B"
       fi
-      remote_sh "test ! -f $target || cp /boot/vmlinuz $target"
+      remote_sh "test ! -f ${target} || \
+                 cp ${basedir}/boot/vmlinuz ${target}"
 
       remote_sh umount /tmp/${PARTITION_NUM_EFI_SYSTEM}
     fi
@@ -308,7 +310,7 @@
       fi
       info "Copying syslinux and /boot"
       remote_send_to /build/"${FLAGS_board}"/boot/ "${remote_basedir}"/boot/
-      update_syslinux_kernel
+      update_syslinux_kernel "${remote_basedir}"
     else
       info "Skipping syslinux and /boot (per request)"
     fi