use crossystem for developer mode and nonchrome detection

init

 #!/bin/sh -x
 
 # 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.
 #
 # /init script for use in factory install shim.  Requires busybox in
 # /bin/busybox, and a symlink from /bin/sh -> busybox.
 
 # USB card partition and mount point.
@@ skipping 554 matching lines @@
   log "About to switch root"
   stop_log_file
   exec switch_root -c /dev/console "$NEWROOT_MNT" /sbin/init
 
   # This should not really happen.
   log "Failed to switch root."
   save_log_file
   return 1
 }
 
+is_nonchrome() {
+  crossystem mainfw_type?nonchrome

[gauravsh, 2011/03/23 02:25:18]

it wasn't clear to me what exactly this does. Does crosystem return 0 (i.e .
succed) if mainfwtype=='nonchrome'?

[Randall Spangler, 2011/03/23 15:54:17]

Yes.  (New feature of crossystem)

+}
+
 is_developer_mode() {
-  # See Firmware High-Level Spec for details on CHSW values
-  CHSW=$(cat /sys/devices/platform/chromeos_acpi/CHSW)
-  # If the switch is unsupported, treat as developer mode.
-  [ -z "$CHSW" ] && return 0
-  if [ $CHSW -gt 0 -a $((CHSW & 32)) -eq 32 ]; then
-    return 0
-  fi
-  return 1
+  # Legacy/unsupported systems are mapped to developer mode.
+  is_nonchrome && return 0
+  # Otherwise the exit status will be accurate.
+  crossystem devsw_boot?1
 }
 
 lock_tpm() {
   if [ -z "$TPM_B_LOCKED" ]; then
     # Depending on the system, the tpm may need to be started.
     # Don't fail if it doesn't work though.
     tpmc startup
     tpmc ctest
     if ! tpmc block; then
-      log "An unrecoverable error occurred with your security device"
-      log "Please power down and try again."
-      dlog "Failed to lock bGlobalLock."
-      on_error
-      return 1  # Never reached.
+      if is_nonchrome; then
+        log "No security chip appears to exist in this non-Chrome device."
+        log "The security of your experience will suffer."
+        # Forge onward.
+      else
+        log "An unrecoverable error occurred with your security device"
+        log "Please power down and try again."
+        dlog "Failed to lock bGlobalLock."
+        on_error
+        return 1  # Never reached.
+      fi
     fi
     TPM_B_LOCKED=y
   fi
   if [ -z "$TPM_PP_LOCKED" ]; then
     # TODO: tpmc pplock if appropriate
     TPM_PP_LOCKED=y
   fi
   return 0
 }
 
@@ skipping 75 matching lines @@
     # USB device is unmounted, we can remove it now.
     unmount_usb || on_error
     # Switch to the new root
     use_new_root || on_error
     on_error # !! Never reached. !!
   fi
 
   # If not, we must be a recovery kernel.
   NEWROOT_MNT="$USB_MNT"
 
+  if is_nonchrome; then
+    log "Your computer does not appear to a Chrome computer!"
+    log " "
+    log "Your experience with Chromium OS will be suboptimal."
+    log " "
+  fi
+
   # Always lock the TPM.  If a NVRAM reset is ever needed, we can change it.
   lock_tpm || on_error
 
   # Perform a full device mapper root validation to avoid any unexpected
   # failures during postinst.  It also allows us to detect if the root is
   # intentionally mismatched - such as during Chromium OS recovery with a
   # Chrome OS recovery kernel.
   if ! validate_recovery_root; then
     is_developer_mode || on_error
     find_developer_root || on_error
@@ skipping 26 matching lines @@
   exit 0
 }
 
 # Make this source-able for testing.
 if [ "$0" = "/init" ]; then
   main "$@"
   # Should never reach here.
   exit 1
 fi