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

Side by Side Diff: mod_for_factory_scripts/200patchInitScript

Issue 5126005: mod_for_factory: Fix factory images for tegra2 (Closed) Base URL: ssh://git@gitrw.chromium.org:9222/crosutils.git
Patch Set: Created 10 years, 1 month 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) 2010 The Chromium OS Authors. All rights reserved. 3 # Copyright (c) 2010 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 patch -d "${ROOT_FS_DIR}" -Np1 <<EOF 10 patch -d "${ROOT_FS_DIR}" -Np1 <<EOF
(...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after
67 67
68 start on started factory 68 start on started factory
69 stop on starting halt or starting reboot 69 stop on starting halt or starting reboot
70 70
71 respawn 71 respawn
72 script 72 script
73 tail -n 48 -F /var/log/factory.log >/dev/tty3 73 tail -n 48 -F /var/log/factory.log >/dev/tty3
74 end script 74 end script
75 EOF 75 EOF
76 76
77 patch -d "${ROOT_FS_DIR}" -Np1 <<EOF 77 if [ -r "${ROOT_FS_DIR}/etc/init/chrontel.conf" ]; then
78 patch -d "${ROOT_FS_DIR}" -Np1 <<EOF
78 diff -Nau old/etc/init/chrontel.conf new/etc/init/ 79 diff -Nau old/etc/init/chrontel.conf new/etc/init/
79 --- old/etc/init/chrontel.conf 2010-08-05 16:32:55.000000000 -0700 80 --- old/etc/init/chrontel.conf 2010-08-05 16:32:55.000000000 -0700
80 +++ new/etc/init/chrontel.conf 2010-08-05 16:32:45.000000000 -0700 81 +++ new/etc/init/chrontel.conf 2010-08-05 16:32:45.000000000 -0700
81 @@ -7,7 +7,7 @@ 82 @@ -7,7 +7,7 @@
82 83
83 # start as early as possible to allow login screen on hdmi 84 # start as early as possible to allow login screen on hdmi
84 # Need udev to have connected the i2c before we can use it 85 # Need udev to have connected the i2c before we can use it
85 -start on started udev 86 -start on started udev
86 +start on never 87 +start on never
87 stop on starting halt or starting reboot 88 stop on starting halt or starting reboot
88 89
89 # sadly, these can't reference each other. 90 # sadly, these can't reference each other.
90 EOF 91 EOF
92 fi
93
94 if [ -r "${ROOT_FS_DIR}/etc/init/nvrm.conf" ]; then
95 patch -d "${ROOT_FS_DIR}" -Np1 << EOF
96 --- old/etc/init/nvrm.conf 2010-11-19 14:57:16.000000000 -0800
97 +++ new/etc/init/nvrm.conf 2010-11-19 16:52:48.000000000 -0800
98 @@ -2,7 +2,7 @@
99 # Use of this source code is governed by a BSD-style license that can be
100 # found in the LICENSE file.
101
102 -start on starting ui
103 +start on starting factory
104
105 respawn
106
107 EOF
108 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