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

Side by Side 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 #!/bin/bash 1 #!/bin/bash
2 2
3 # Copyright (c) 2011 The Chromium OS Authors. All rights reserved. 3 # Copyright (c) 2011 The Chromium OS Authors. All rights reserved.
4 # Use of this source code is governed by a BSD-style license that can be 4 # Use of this source code is governed by a BSD-style license that can be
5 # found in the LICENSE file. 5 # found in the LICENSE file.
6 6
7 echo "Applying patch to init scripts." 7 echo "Applying patch to init scripts."
8 8
9 touch "${ROOT_FS_DIR}/root/.factory_test" 9 touch "${ROOT_FS_DIR}/root/.factory_test"
10 touch "${ROOT_FS_DIR}/root/.leave_firmware_alone" 10 touch "${ROOT_FS_DIR}/root/.leave_firmware_alone"
(...skipping 30 matching lines...) Expand all
41 patch -d "${ROOT_FS_DIR}" -Np1 <<EOF 41 patch -d "${ROOT_FS_DIR}" -Np1 <<EOF
42 diff -Nau old/etc/init/chrontel.conf new/etc/init/ 42 diff -Nau old/etc/init/chrontel.conf new/etc/init/
43 --- old/etc/init/chrontel.conf 2010-08-05 16:32:55.000000000 -0700 43 --- old/etc/init/chrontel.conf 2010-08-05 16:32:55.000000000 -0700
44 +++ new/etc/init/chrontel.conf 2010-08-05 16:32:45.000000000 -0700 44 +++ new/etc/init/chrontel.conf 2010-08-05 16:32:45.000000000 -0700
45 @@ -7 +7 @@ 45 @@ -7 +7 @@
46 -start on started udev 46 -start on started udev
47 +start on never 47 +start on never
48 EOF 48 EOF
49 fi 49 fi
50 50
51 if [ -r "${ROOT_FS_DIR}/etc/init/nvrm.conf" ]; then 51 if [ -r "${ROOT_FS_DIR}/etc/init/tegra-devices.conf" ]; then
52 patch -d "${ROOT_FS_DIR}" -Np1 << EOF 52 patch -d "${ROOT_FS_DIR}" -Np1 <<EOF
53 --- old/etc/init/nvrm.conf» 2010-11-19 14:57:16.000000000 -0800 53 diff -Nau old/etc/init/tegra-devices.conf new/etc/init/
54 +++ new/etc/init/nvrm.conf» 2010-11-19 16:52:48.000000000 -0800 54 --- old/etc/init/tegra-devices.conf» 2011-04-08 10:40:01.000000000 -0500
55 @@ -2,7 +2,7 @@ 55 +++ new/etc/init/tegra-devices.conf» 2011-04-08 10:40:16.000000000 -0500
56 # Use of this source code is governed by a BSD-style license that can be 56 @@ -9,7 +9,7 @@ author "chromium-os-dev@chromium.
57 # found in the LICENSE file. 57 # ui runs, so we won't be racing with X starting. It will be left in
58 # "running" state by upstart so it won't re-launch on every ui restart
58 59
59 -start on starting ui 60 -start on starting ui
60 +start on starting factory 61 +start on starting factory
61 62
62 respawn 63 pre-start script
63 64 for i in nvmap nvos nvrm nvrpc nvfw tegra_avp tegra_sema tegra_rpc ; do
64 EOF 65 EOF
65 fi 66 fi
OLDNEW
« 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