From b2d2212bb9cb02c749cbc8a1d72d233864bdc7d3 Mon Sep 17 00:00:00 2001
From: Kenneth Waters <kwaters@chromium.org>
Date: Wed, 24 Nov 2010 12:29:40 -0800
Subject: [PATCH] mod_for_factory: Fix factory images for tegra2

- Conditionally patch chrontel.conf
- Add a patch for nvrm to start on factory, so that X can start.

BUG=crosbug.com/p/1721
TEST=Built and run factory image for tegra2_seaboard

Change-Id: Ied87b6d959f940ef8e99e124ab419fdeea48aa26

Review URL: http://codereview.chromium.org/5126005
---
 mod_for_factory_scripts/200patchInitScript | 20 +++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

diff --git a/mod_for_factory_scripts/200patchInitScript b/mod_for_factory_scripts/200patchInitScript
index 9a57b3f831..747f10b215 100755
--- a/mod_for_factory_scripts/200patchInitScript
+++ b/mod_for_factory_scripts/200patchInitScript
@@ -64,7 +64,8 @@ tail -n 48 -F /var/log/factory.log >/dev/tty3
 end script
 EOF
 
-patch -d "${ROOT_FS_DIR}" -Np1 <<EOF
+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
@@ -72,3 +73,20 @@ diff -Nau old/etc/init/chrontel.conf new/etc/init/
 -start on started udev
 +start on never
 EOF
+fi
+
+if [ -r "${ROOT_FS_DIR}/etc/init/nvrm.conf" ]; then
+  patch -d "${ROOT_FS_DIR}" -Np1 << EOF
+--- old/etc/init/nvrm.conf	2010-11-19 14:57:16.000000000 -0800
++++ new/etc/init/nvrm.conf	2010-11-19 16:52:48.000000000 -0800
+@@ -2,7 +2,7 @@
+ # Use of this source code is governed by a BSD-style license that can be
+ # found in the LICENSE file.
+ 
+-start on starting ui
++start on starting factory
+ 
+ respawn
+ 
+EOF
+fi