commit 68cbfaf71aa6a2adf31b994842fab6ad2d1e3b14
author Olof Johansson <olofj@chromium.org> Tue Apr 23 14:06:28 2013 -0700
committer ChromeBot <chrome-bot@google.com> Tue Apr 23 15:47:55 2013 -0700
tree 7b7536032a2d7621d2256969dd80f0e310e6905b
parent 706c4144b52120479e9136375a119f09ebe70f36

update_kernel: add option to disable syslinux kernel update

This makes it easier to do update_kernel to a system that has booted
without modules, since the syslinux partition tends to be FAT formatted
and we don't have that statically built into the kernel most of the time.

The code has just been moved (with whitespace reformatting).

BUG=none
TEST=adhoc; make sure update_kernel still works and that --nosyslinux
skips syslinux kernel install.

Change-Id: I07a4c6a240ef57846a7f8c7828ef17583b03b7b6
Signed-off-by: Olof Johansson <olofj@chromium.org>
Reviewed-on: https://gerrit.chromium.org/gerrit/48949
Reviewed-by: Sonny Rao <sonnyrao@chromium.org>

update_kernel.sh

diff --git a/update_kernel.sh b/update_kernel.sh
index d2849f4..6deb04a 100755
--- a/update_kernel.sh
+++ b/update_kernel.sh
@@ -19,6 +19,7 @@
 DEFINE_string arch "" "Override architecture reported by target"
 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"
 
 # Parse command line.
 FLAGS "$@" || exit 1
@@ -103,6 +104,27 @@
   fi
 }
 
+update_syslinux_kernel() {
+  # ARM does not have the syslinux directory, so skip it when the
+  # partition or the syslinux vmlinuz target is missing.
+  echo "updating syslinux kernel"
+  remote_sh grep $(echo ${FLAGS_device}12 | cut -d/ -f3) /proc/partitions
+  if [ $(echo "$REMOTE_OUT" | wc -l) -eq 1 ]; then
+    remote_sh mkdir -p /tmp/12
+    remote_sh mount ${FLAGS_device}12 /tmp/12
+
+    if [ "$FLAGS_partition" = "${FLAGS_device}2" ]; then
+      target="/tmp/12/syslinux/vmlinuz.A"
+    else
+      target="/tmp/12/syslinux/vmlinuz.B"
+    fi
+    remote_sh "test ! -f $target || cp /boot/vmlinuz $target"
+
+    remote_sh umount /tmp/12
+    remote_sh rmdir /tmp/12
+  fi
+}
+
 main() {
   trap cleanup EXIT
 
@@ -133,23 +155,8 @@
     echo "copying kernel"
     remote_send_to /build/"${FLAGS_board}"/boot/ /boot/
 
-    # ARM does not have the syslinux directory, so skip it when the
-    # partition or the syslinux vmlinuz target is missing.
-    echo "updating syslinux kernel"
-    remote_sh grep $(echo ${FLAGS_device}12 | cut -d/ -f3) /proc/partitions
-    if [ $(echo "$REMOTE_OUT" | wc -l) -eq 1 ]; then
-        remote_sh mkdir -p /tmp/12
-        remote_sh mount ${FLAGS_device}12 /tmp/12
-
-        if [ "$FLAGS_partition" = "${FLAGS_device}2" ]; then
-            target="/tmp/12/syslinux/vmlinuz.A"
-        else
-            target="/tmp/12/syslinux/vmlinuz.B"
-        fi
-        remote_sh "test ! -f $target || cp /boot/vmlinuz $target"
-
-        remote_sh umount /tmp/12
-        remote_sh rmdir /tmp/12
+    if [ ${FLAGS_syslinux} -eq ${FLAGS_TRUE} ]; then
+      update_syslinux_kernel
     fi
 
     echo "copying modules"