From 662588686a21c2004e09118a78e905f49d5cea64 Mon Sep 17 00:00:00 2001
From: Hung-Te Lin <hungte@chromium.org>
Date: Wed, 31 Aug 2011 16:16:36 +0800
Subject: [PATCH] crosutils: clean up factory test image modification scripts

This is the counterpart of http://gerrit.chromium.org/gerrit/6992 ,
which moves init modification from scripts folder into ebuild file.
The 'customizeRelease' is also already deprecated.

BUG=chromium-os:9596
TEST=build_images --factory # pass

Change-Id: I8087f627f4b13d9f6b1d4bf6003630298a87c627
Reviewed-on: http://gerrit.chromium.org/gerrit/7040
Reviewed-by: Nick Sanders <nsanders@chromium.org>
Tested-by: Hung-Te Lin <hungte@chromium.org>
---
 mod_for_factory_scripts/200patchInitScript  | 66 ---------------------
 mod_for_factory_scripts/600customizeRelease | 24 --------
 2 files changed, 90 deletions(-)
 delete mode 100755 mod_for_factory_scripts/200patchInitScript
 delete mode 100755 mod_for_factory_scripts/600customizeRelease

diff --git a/mod_for_factory_scripts/200patchInitScript b/mod_for_factory_scripts/200patchInitScript
deleted file mode 100755
index 1ec430f492..0000000000
--- a/mod_for_factory_scripts/200patchInitScript
+++ /dev/null
@@ -1,66 +0,0 @@
-#!/bin/bash
-
-# Copyright (c) 2011 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.
-
-echo "Applying patch to init scripts."
-
-touch "${ROOT_FS_DIR}/root/.factory_test"
-touch "${ROOT_FS_DIR}/root/.leave_firmware_alone"
-
-patch -d "${ROOT_FS_DIR}" -Np1 <<EOF
---- old/etc/init/ui.conf	2010-04-28 21:28:38.886069000 -0700
-+++ new/etc/init/ui.conf	2010-04-28 21:29:42.676163000 -0700
-@@ -11 +11 @@
--start on starting boot-services
-+start on never
-EOF
-
-patch -d "${ROOT_FS_DIR}" -Np1 <<EOF
-diff -Naur old/etc/init/boot-complete.conf new/etc/init/boot-complete.conf
---- old/etc/init/boot-complete.conf	2010-07-21 11:22:30.000000000 +0800
-+++ new/etc/init/boot-complete.conf	2010-07-21 22:13:36.000000000 +0800
-@@ -15 +15 @@
--start on login-prompt-visible
-+start on started boot-services
-EOF
-
-if [ -r "${ROOT_FS_DIR}/etc/init/update-engine.conf" ]; then
-  patch -d "${ROOT_FS_DIR}" -Np1 <<EOF
-diff -Na -U 0 old/etc/init/update-engine.conf new/etc/init/
---- old/etc/init/update-engine.conf	2010-08-05 16:32:55.000000000 -0700
-+++ new/etc/init/update-engine.conf	2010-08-05 16:32:45.000000000 -0700
-@@ -8 +8 @@
--start on starting system-services
-+start on never
-EOF
-fi
-
-if [ -r "${ROOT_FS_DIR}/etc/init/chrontel.conf" ]; then
-  patch -d "${ROOT_FS_DIR}" -Np1 <<EOF
-diff -Nau old/etc/init/chrontel.conf new/etc/init/
---- old/etc/init/chrontel.conf	2010-08-05 16:32:55.000000000 -0700
-+++ new/etc/init/chrontel.conf	2010-08-05 16:32:45.000000000 -0700
-@@ -7 +7 @@
--start on starting boot-services
-+start on never
-EOF
-fi
-
-if [ -r "${ROOT_FS_DIR}/etc/init/tegra-devices.conf" ]; then
-  patch -d "${ROOT_FS_DIR}" -Np1 <<EOF
-diff -Nau old/etc/init/tegra-devices.conf new/etc/init/
---- old/etc/init/tegra-devices.conf	2011-04-08 10:40:01.000000000 -0500
-+++ new/etc/init/tegra-devices.conf	2011-04-08 10:40:16.000000000 -0500
-@@ -9,7 +9,7 @@ author        "chromium-os-dev@chromium.
- # ui runs, so we won't be racing with X starting. It will be left in
- # "running" state by upstart so it won't re-launch on every ui restart
- 
--start on starting ui
-+start on starting factory
- 
- pre-start script
-   for i in nvmap nvos nvrm nvrpc nvfw tegra_avp tegra_sema tegra_rpc ; do
-EOF
-fi
diff --git a/mod_for_factory_scripts/600customizeRelease b/mod_for_factory_scripts/600customizeRelease
deleted file mode 100755
index 0c8dd21a76..0000000000
--- a/mod_for_factory_scripts/600customizeRelease
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/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.
-
-TEST_DIR="${ROOT_FS_DIR}/usr/local/autotest/site_tests/suite_Factory"
-
-if [ -d "${TEST_DIR}" ]; then
-  pushd "${TEST_DIR}" >/dev/null
-
-  # If there is a customize_$BOARD script for this board, let's run it.
-  # This allows adding settings for specific factories or systems.
-  CUSTOMIZE="customize_${BOARD}"
-  if [ -e "${CUSTOMIZE}" ]; then
-    echo "Running ${CUSTOMIZE}"
-    "./${CUSTOMIZE}"
-  fi
-
-  # We don't need the customize script anymore.
-  rm -f customize_*
-
-  popd >/dev/null
-fi