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

chromeos_startup

Index: chromeos_startup
diff --git a/chromeos_startup b/chromeos_startup
index aecbf1dc1612664d0aa5e967fa2d70768296b434..d0452ac0d4122de01560cf6b1f60818d5a6d7bcc 100755
--- a/chromeos_startup
+++ b/chromeos_startup
@@ -103,20 +103,26 @@ DEVMODE=$((! $?))
 FIRMWARE_UPDATE_SCRIPT='/usr/sbin/chromeos-firmwareupdate'
 FIRMWARE_UPDATE_LOGS='/mnt/stateful_partition/var/log/update_firmware.log'
 if [ -x "$FIRMWARE_UPDATE_SCRIPT" ]; then

[jrbarnette, 2011/03/29 00:14:03]

This is pre-existing, but can we delete it?  Is there any valid system
configuration that allows this script not to exist?

If necessary, I can file a bug to get this fixed separately.

[Stefan Reinauer, 2011/03/29 20:30:16]

Not sure if there is. On chromium builds the file seems to be there but empty.
There are a whole lot of use cases like this all over the init scripts. Maybe a
bug to clean them up would make sense?

-  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"
-    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 |
+  if crossystem mainfw_type?developer; then

[jrbarnette, 2011/03/29 00:14:03]

Ugh.  Is this really the syntax for crossystem arguments?
Using '?' in arguments is problematic, because the shell
interprets this character specially.  At minimum, this argument
needs to be quoted.  Better would be to fix the crossystem
command syntax.

[Stefan Reinauer, 2011/03/29 20:30:16]

fixed

+    FIRMWARE_UPDATE_LOGS="/dev/tty1 $FIRMWARE_UPDATE_LOGS"
+    "$FIRMWARE_UPDATE_SCRIPT" --mode=devstartup 2>&1 |

[Randall Spangler, 2011/03/28 22:00:25]

If this returns error (for example, if 'mosys -k ec info' fails), we'll keep
going, right?  I don't see a 'set -e' above so I assume that's true.

[jrbarnette, 2011/03/29 00:14:03]

There's no set -e in this script, so failures shouldn't stop things.
Moreover, the exit status of this pipeline is the exit status of the 'tee'
command, not the update script (at least with dash).  So, this command
won't fail unless 'tee' fails, which is sufficiently unlikely that we can
discount it (knock on wood).

       tee $FIRMWARE_UPDATE_LOGS
+  else
+    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"
+      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 ))

[Randall Spangler, 2011/03/28 22:00:25]

I'd be tempted to move the decrement to just after line 112, so if anything goes
wrong in setting up the update (lines 113-119) we'll eventually run out of
tries.

[Stefan Reinauer, 2011/03/29 20:30:16]

done

+
+      "$FIRMWARE_UPDATE_SCRIPT" --mode=startup 2>&1 |
+        tee $FIRMWARE_UPDATE_LOGS
+    fi
   fi
 fi