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

Side by Side Diff: mod_for_factory_scripts/200patchInitScript

Issue 6567004: crosutils: fixing factory upstart script to allow stopping factory test ui. (Closed) Base URL: ssh://git@gitrw.chromium.org:9222/crosutils.git@master
Patch Set: remove the VT1 hack. Created 9 years, 10 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) 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 10
(...skipping 30 matching lines...) Expand all
41 eval \$(./site_tests/suite_Factory/startx.sh) 41 eval \$(./site_tests/suite_Factory/startx.sh)
42 date >>/var/log/factory.log 42 date >>/var/log/factory.log
43 if [ ! -e factory_started ]; then 43 if [ ! -e factory_started ]; then
44 touch factory_started 44 touch factory_started
45 cp -f site_tests/suite_Factory/control . 45 cp -f site_tests/suite_Factory/control .
46 ./bin/autotest -t factory control >>/var/log/factory.log 2>&1 46 ./bin/autotest -t factory control >>/var/log/factory.log 2>&1
47 else 47 else
48 ./bin/autotest -t factory -c control >>/var/log/factory.log 2>&1 48 ./bin/autotest -t factory -c control >>/var/log/factory.log 2>&1
49 fi 49 fi
50 end script 50 end script
51
52 pre-stop script
53 pkill python
54 pkill X
55 end script
56
57 post-stop script
58 chvt 2
59 end script
51 EOF 60 EOF
52 61
53 cat >"${ROOT_FS_DIR}/etc/init/factorylog.conf" <<EOF 62 cat >"${ROOT_FS_DIR}/etc/init/factorylog.conf" <<EOF
54 # Copyright (c) 2010 The Chromium OS Authors. All rights reserved. 63 # Copyright (c) 2010 The Chromium OS Authors. All rights reserved.
55 # Use of this source code is governed by a BSD-style license that can be 64 # Use of this source code is governed by a BSD-style license that can be
56 # found in the LICENSE file. 65 # found in the LICENSE file.
57 66
58 description "Print Chrome OS factory log to tty3" 67 description "Print Chrome OS factory log to tty3"
59 author "chromium-os-dev@chromium.org" 68 author "chromium-os-dev@chromium.org"
60 69
(...skipping 25 matching lines...) Expand all
86 # Use of this source code is governed by a BSD-style license that can be 95 # Use of this source code is governed by a BSD-style license that can be
87 # found in the LICENSE file. 96 # found in the LICENSE file.
88 97
89 -start on starting ui 98 -start on starting ui
90 +start on starting factory 99 +start on starting factory
91 100
92 respawn 101 respawn
93 102
94 EOF 103 EOF
95 fi 104 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