run --mode=devstartup unconditionally if we booted developer firmware

chromeos_startup

 #!/bin/sh
 
 # Copyright (c) 2010 The Chromium OS Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 
 # Used to determine whether to run the firmware updater in the critical path
 # (hence get_startup_update_tries() is not in chromeos-firmware-update)
 get_startup_update_tries() {
@@ skipping 85 matching lines @@
 # DEVMODE is used to determine if we're booted in developer mode,
 # by checking only the developer and recovery switch states.
 # Values: 0=recovery/non-dev mode, 1=dev (SSD) mode, 2=bypass devcheck
 crossystem devsw_boot?1 recoverysw_boot?0
 DEVMODE=$((! $?))
 
 # Check if we need to perform firmware update.
 FIRMWARE_UPDATE_SCRIPT='/usr/sbin/chromeos-firmwareupdate'
 FIRMWARE_UPDATE_LOGS='/mnt/stateful_partition/var/log/update_firmware.log'
 if [ -x "$FIRMWARE_UPDATE_SCRIPT" ]; then
-  tries="$(get_startup_update_tries)"
-  if [ $tries -gt 0 ]; then
-    if [ "$DEVMODE" = "1" -o -f /root/.dev_mode ]; then
-      # More message on console for developer mode and dev builds
-      FIRMWARE_UPDATE_LOGS="/dev/tty1 $FIRMWARE_UPDATE_LOGS"
+  if [ "$(crossystem mainfw_type)" = developer ]; then
+    FIRMWARE_UPDATE_LOGS="/dev/tty1 $FIRMWARE_UPDATE_LOGS"
+    "$FIRMWARE_UPDATE_SCRIPT" --mode=devstartup 2>&1 |
+      tee $FIRMWARE_UPDATE_LOGS
+  else
+    tries="$(get_startup_update_tries)"
+    if [ $tries -gt 0 ]; then
+      set_startup_update_tries $(( $tries - 1 ))
+
+      if [ "$DEVMODE" = "1" -o -f /root/.dev_mode ]; then
+        # More message on console for developer mode and dev builds
+        FIRMWARE_UPDATE_LOGS="/dev/tty1 $FIRMWARE_UPDATE_LOGS"
+      fi
+      mkdir -p /mnt/stateful_partition/var/log
+      [ -z "$BOOT_SPLASH_PID" ] || wait $BOOT_SPLASH_PID
+      chromeos-boot-alert update_firmware /dev/tty1
+
+      "$FIRMWARE_UPDATE_SCRIPT" --mode=startup 2>&1 |
+        tee $FIRMWARE_UPDATE_LOGS
     fi
-    mkdir -p /mnt/stateful_partition/var/log
-    [ -z "$BOOT_SPLASH_PID" ] || wait $BOOT_SPLASH_PID
-    chromeos-boot-alert update_firmware /dev/tty1
-
-    set_startup_update_tries $(( $tries - 1 ))
-
-    "$FIRMWARE_UPDATE_SCRIPT" --mode=startup 2>&1 |
-      tee $FIRMWARE_UPDATE_LOGS
   fi
 fi
 
 # If we've switched from verified mode to developer mode, clobber the state.
 # The reverse is not possible to detect reliably, but we try.
 # In addition, normal and unsupported are treated are equivalent otherwise
 # booting the first time on a legacy device would clobber state for no reason.
 # (NOTE, this will not be triggered in recovery mode.)
 
 # File used to trigger a stateful reset
@@ skipping 188 matching lines @@
 #
 ureadahead &
 
 # Some things freak out if no hostname is set.
 hostname localhost
 
 bootstat post-startup
 
 # Always return success to avoid killing init
 exit 0