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

Side by Side Diff: mod_for_factory_scripts/200patchInitScript

Issue 5219001: Clean var formatting in mod_for_factory (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
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
11 --- old/etc/init/ui.conf 2010-04-28 21:28:38.886069000 -0700 11 --- old/etc/init/ui.conf 2010-04-28 21:28:38.886069000 -0700
12 +++ new/etc/init/ui.conf 2010-04-28 21:29:42.676163000 -0700 12 +++ new/etc/init/ui.conf 2010-04-28 21:29:42.676163000 -0700
13 @@ -5,7 +5,7 @@ 13 @@ -5,7 +5,7 @@
14 description "Chrome OS user interface" 14 description "Chrome OS user interface"
15 author "chromium-os-dev@googlegroups.com" 15 author "chromium-os-dev@googlegroups.com"
16 16
17 -start on stopping startup 17 -start on stopping startup
18 +start on never 18 +start on never
19 stop on starting halt or starting reboot 19 stop on starting halt or starting reboot
20 20
21 respawn 21 respawn
22 EOF 22 EOF
23 23
24 patch -d ${ROOT_FS_DIR} -Np1 <<EOF 24 patch -d "${ROOT_FS_DIR}" -Np1 <<EOF
25 diff -Naur old/etc/init/dump-boot-stats.conf new/etc/init/dump-boot-stats.conf 25 diff -Naur old/etc/init/dump-boot-stats.conf new/etc/init/dump-boot-stats.conf
26 --- old/etc/init/boot-complete.conf 2010-07-21 11:22:30.000000000 +0800 26 --- old/etc/init/boot-complete.conf 2010-07-21 11:22:30.000000000 +0800
27 +++ new/etc/init/boot-complete.conf 2010-07-21 22:13:36.000000000 +0800 27 +++ new/etc/init/boot-complete.conf 2010-07-21 22:13:36.000000000 +0800
28 @@ -7,7 +7,7 @@ 28 @@ -7,7 +7,7 @@
29 # Processing required during boot after login prompt is displayed. 29 # Processing required during boot after login prompt is displayed.
30 # Primarily, this means calculating boot time statistics. 30 # Primarily, this means calculating boot time statistics.
31 31
32 -start on login-prompt-ready 32 -start on login-prompt-ready
33 +start on stopping startup 33 +start on stopping startup
34 34
35 task 35 task
36 EOF 36 EOF
37 37
38 cat > ${ROOT_FS_DIR}/etc/init/factory.conf <<EOF 38 cat >"${ROOT_FS_DIR}/etc/init/factory.conf" <<EOF
39 # Copyright (c) 2010 The Chromium OS Authors. All rights reserved. 39 # Copyright (c) 2010 The Chromium OS Authors. All rights reserved.
40 # Use of this source code is governed by a BSD-style license that can be 40 # Use of this source code is governed by a BSD-style license that can be
41 # found in the LICENSE file. 41 # found in the LICENSE file.
42 42
43 description "Chrome OS factory startup stub" 43 description "Chrome OS factory startup stub"
44 author "chromium-os-dev@googlegroups.com" 44 author "chromium-os-dev@googlegroups.com"
45 45
46 start on started udev 46 start on started udev
47 stop on starting halt or starting reboot 47 stop on starting halt or starting reboot
48 48
49 script 49 script
50 cd /usr/local/autotest 50 cd /usr/local/autotest
51 eval \$(./site_tests/suite_Factory/startx.sh) 51 eval \$(./site_tests/suite_Factory/startx.sh)
52 date >> /var/log/factory.log 52 date >> /var/log/factory.log
53 if [ ! -e factory_started ]; then 53 if [ ! -e factory_started ]; then
54 touch factory_started 54 touch factory_started
55 cp -f site_tests/suite_Factory/control . 55 cp -f site_tests/suite_Factory/control .
56 ./bin/autotest control >> /var/log/factory.log 2>&1 56 ./bin/autotest control >> /var/log/factory.log 2>&1
57 else 57 else
58 ./tools/autotest >> /var/log/factory.log 2>&1 58 ./tools/autotest >> /var/log/factory.log 2>&1
59 fi 59 fi
60 end script 60 end script
61 EOF 61 EOF
62 62
63 cat > ${ROOT_FS_DIR}/etc/init/factorylog.conf <<EOF 63 cat >"${ROOT_FS_DIR}/etc/init/factorylog.conf" <<EOF
64 # Copyright (c) 2010 The Chromium OS Authors. All rights reserved. 64 # Copyright (c) 2010 The Chromium OS Authors. All rights reserved.
65 # Use of this source code is governed by a BSD-style license that can be 65 # Use of this source code is governed by a BSD-style license that can be
66 # found in the LICENSE file. 66 # found in the LICENSE file.
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 patch -d "${ROOT_FS_DIR}" -Np1 <<EOF
78 diff -Nau old/etc/init/chrontel.conf new/etc/init/ 78 diff -Nau old/etc/init/chrontel.conf new/etc/init/
79 --- old/etc/init/chrontel.conf 2010-08-05 16:32:55.000000000 -0700 79 --- 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 80 +++ new/etc/init/chrontel.conf 2010-08-05 16:32:45.000000000 -0700
81 @@ -7,7 +7,7 @@ 81 @@ -7,7 +7,7 @@
82 82
83 # start as early as possible to allow login screen on hdmi 83 # start as early as possible to allow login screen on hdmi
84 # Need udev to have connected the i2c before we can use it 84 # Need udev to have connected the i2c before we can use it
85 -start on started udev 85 -start on started udev
86 +start on never 86 +start on never
87 stop on starting halt or starting reboot 87 stop on starting halt or starting reboot
88 88
89 # sadly, these can't reference each other. 89 # sadly, these can't reference each other.
90 EOF 90 EOF
OLDNEW
« no previous file with comments | « no previous file | mod_for_factory_scripts/300modifyDescription » ('j') | mod_for_factory_scripts/500populateQualDbs » ('J')

Powered by Google App Engine
This is Rietveld 408576698