Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1137)

Unified Diff: mod_for_factory_scripts/200patchInitScript

Issue 6826001: fix factory scripts based on nvrm changes (Closed) Base URL: ssh://gitrw.chromium.org:9222/crosutils.git@master
Patch Set: add back missing EOF+fi Created 9 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: mod_for_factory_scripts/200patchInitScript
diff --git a/mod_for_factory_scripts/200patchInitScript b/mod_for_factory_scripts/200patchInitScript
index 5812b63fdbb0b51f5728476bb25d6de35c2301d5..fa041d177299a4591420106cea2620e57be2013f 100755
--- a/mod_for_factory_scripts/200patchInitScript
+++ b/mod_for_factory_scripts/200patchInitScript
@@ -48,18 +48,19 @@ diff -Nau old/etc/init/chrontel.conf new/etc/init/
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.
+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
- respawn
-
+ pre-start script
+ for i in nvmap nvos nvrm nvrpc nvfw tegra_avp tegra_sema tegra_rpc ; do
EOF
fi
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698