Index: scripts/setup.sh
===================================================================
diff -u -r0e122c98700951af539d9f47c5578e26d640fcc7 -rf45f4093470d79f74c79f5a162bff598215b5dda
--- scripts/setup.sh	(.../setup.sh)	(revision 0e122c98700951af539d9f47c5578e26d640fcc7)
+++ scripts/setup.sh	(.../setup.sh)	(revision f45f4093470d79f74c79f5a162bff598215b5dda)
@@ -127,6 +127,12 @@
   update-rc.d $INITD_AUTOSTART defaults
 }
 
+function manufacturingMode() {
+  if [ "$(grep $SETUP_ENABLE_MANUFACTURING_MODE $SETUP_CONF_FILE)" != "" ]; then
+    $HOME/$DENALI_BIN -E # don't use '&', we have to wait until user is done with UI
+  fi
+}
+
 function confirm_reboot() {
   read -p "ready to reboot? [y,n]" -n 1 -r CONFIRM
   if [ "$CONFIRM" == "y" ]; then
@@ -144,6 +150,7 @@
     diable_b2qt_services
     setup_denali
     enable_autostart
+    manufacturingMode
 }
 
 main "$1" "$2"