Further updates to factory installer

chromeos/scripts/customize_rootfs

Index: chromeos/scripts/customize_rootfs
diff --git a/chromeos/scripts/customize_rootfs b/chromeos/scripts/customize_rootfs
index d9a15b1906798994ce09c24ae6f327defe39e384..7474163e7d9ac55ed8f1181cf4c54a933c4f2b1a 100755
--- a/chromeos/scripts/customize_rootfs
+++ b/chromeos/scripts/customize_rootfs
@@ -28,8 +28,6 @@ DEFINE_string root ""      \
   "The root file system to customize."
 DEFINE_boolean withdev $FLAGS_TRUE \
   "Include useful developer friendly utilities in the image."
-DEFINE_string factory_server "" \
-  "Build a factory install image pointing to given server."
 
 # Parse command line
 FLAGS "$@" || exit 1
@@ -271,11 +269,6 @@ else
   export CHROMEOS_VERSION_DESCRIPTION="${CHROMEOS_VERSION_STRING} (Developer Build ${CHROMEOS_REVISION:?} - $(date) - $USER)"
 fi
 
-if [ -n "$FLAGS_factory_server" ]; then
-  CHROMEOS_VERSION_AUSERVER="$FLAGS_factory_server"
-  CHROMEOS_VERSION_DEVSERVER=""
-fi
-
 # Set google-specific version numbers:
 # CHROMEOS_RELEASE_BOARD is the target board identifier.
 # CHROMEOS_RELEASE_CODENAME is the codename of the release.
@@ -298,21 +291,6 @@ CHROMEOS_AUSERVER=$CHROMEOS_VERSION_AUSERVER
 CHROMEOS_DEVSERVER=$CHROMEOS_VERSION_DEVSERVER
 EOF
 
-if [ -n "$FLAGS_factory_server" ]; then
-  cat <<EOF | sudo dd of="${ROOT_FS_DIR}/etc/lsb-release" \
-              oflag=append conv=notrunc
-FACTORY_INSTALL=1
-HTTP_SERVER_OVERRIDE=true
-EOF
-  sudo sed -i '/CHROMEOS_DEVSERVER=/d' "${ROOT_FS_DIR}/etc/lsb-release"
-  # Remove ui.conf startup script, which will make sure chrome doesn't
-  # run, since it tries to update on startup
-  sudo rm -f "${ROOT_FS_DIR}/etc/init/ui.conf"
-  # Set network to start up another way
-  sudo sed -i 's/login-prompt-ready/stopping startup/' \
-      "${ROOT_FS_DIR}/etc/init/dump-boot-stats.conf"
-fi
-
 # We need to replace /etc/pulse/client.conf and /etc/pulse/default.pa with our
 # own versions.
 #