Further updates to factory installer

chromeos/scripts/customize_rootfs

 #!/bin/bash
 
 # 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.
 
 # Script to customize the root file system after packages have been installed.
 #
 # NOTE: This is currently a dumping ground for for a bunch of hacks, some of
 # which are to work around the fact that we are trying not to modify the base
@@ skipping 10 matching lines @@
 
 # Flags
 DEFINE_string target "x86" \
   "The target architecture to build for. One of { x86, arm }."
 DEFINE_string board ""      \
   "The board to build an image for."
 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
 eval set -- "${FLAGS_ARGV}"
 
 # Die on any errors.
 set -e
 
 . "${SCRIPTS_DIR}/chromeos_version.sh"
 
@@ skipping 221 matching lines @@
 # where CHROMEOS_REVISION is set
 if [ ${CHROMEOS_OFFICIAL:-0} = 1 ]; then
   export CHROMEOS_VERSION_DESCRIPTION="${CHROMEOS_VERSION_STRING} (Official Build ${CHROMEOS_REVISION:?})"
 elif [ "$USER" = "chrome-bot" ]
 then
   export CHROMEOS_VERSION_DESCRIPTION="${CHROMEOS_VERSION_STRING} (Continuous Build ${CHROMEOS_REVISION:?} - Builder: ${BUILDBOT_BUILD:-"N/A"})"
 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.
 # CHROMEOS_RELEASE_DESCRIPTION is the version displayed by Chrome; see
 #   chrome/browser/chromeos/chromeos_version_loader.cc.
 # CHROMEOS_RELEASE_NAME is a human readable name for the build.
 # CHROMEOS_RELEASE_TRACK and CHROMEOS_RELEASE_VERSION are used by the software
 #   update service.
 # TODO(skrul):  Remove GOOGLE_RELEASE once Chromium is updated to look at
 #   CHROMEOS_RELEASE_VERSION for UserAgent data.
 cat <<EOF | sudo dd of="${ROOT_FS_DIR}/etc/lsb-release"
 CHROMEOS_RELEASE_BOARD=$FLAGS_board
 CHROMEOS_RELEASE_CODENAME=$CHROMEOS_VERSION_CODENAME
 CHROMEOS_RELEASE_DESCRIPTION=$CHROMEOS_VERSION_DESCRIPTION
 CHROMEOS_RELEASE_NAME=$CHROMEOS_VERSION_NAME
 CHROMEOS_RELEASE_TRACK=$CHROMEOS_VERSION_TRACK
 CHROMEOS_RELEASE_VERSION=$CHROMEOS_VERSION_STRING
 GOOGLE_RELEASE=$CHROMEOS_VERSION_STRING
 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.
 #
 # TODO(ajwong): Find a way to override the default pulseaudio config files,
 # ideally in an ebuild.
 sudo mv "${ROOT_FS_DIR}/etc/pulse/client-cros.conf" \
   "${ROOT_FS_DIR}/etc/pulse/client.conf"
 sudo mv "${ROOT_FS_DIR}/etc/pulse/default-cros.pa" \
   "${ROOT_FS_DIR}/etc/pulse/default.pa"
 
@@ skipping 12 matching lines @@
     QEMU="qemu-i386"
     ;;
   *)
     error "Unable to determine ARCH from toolchain: $CHOST"
     exit 1
 esac
 cp "/usr/bin/${QEMU}" "${ROOT_FS_DIR}/tmp"
 sudo mkdir -p "${ROOT_FS_DIR}/usr/share/fontconfig"
 sudo chroot "${ROOT_FS_DIR}" "/tmp/${QEMU}" /usr/bin/fc-cache -f
 rm "${ROOT_FS_DIR}/tmp/${QEMU}"