Index: src/scripts/mod_for_factory_scripts/200patchInitScript |
diff --git a/src/scripts/mod_for_factory_scripts/200patchInitScript b/src/scripts/mod_for_factory_scripts/200patchInitScript |
index 2a804af256c180325cfb7d18f090670761b1b5be..a64336819265a51ace06000e2176e7e8c540ffb0 100755 |
--- a/src/scripts/mod_for_factory_scripts/200patchInitScript |
+++ b/src/scripts/mod_for_factory_scripts/200patchInitScript |
@@ -8,14 +8,30 @@ echo "Applying patch to init scripts." |
pushd ${ROOT_FS_DIR} |
patch -d ${ROOT_FS_DIR} -Np1 <<EOF |
+--- old/etc/init/ui.conf 2010-04-28 21:28:38.886069000 -0700 |
++++ new/etc/init/ui.conf 2010-04-28 21:29:42.676163000 -0700 |
+@@ -5,7 +5,8 @@ |
+ description "Chrome OS user interface" |
+ author "chromium-os-dev@googlegroups.com" |
+ |
+-start on stopping startup |
++# start on stopping startup |
Tom Wai-Hong Tam
2010/04/30 02:45:30
I don't think it's necessary to keep it as comment
|
++start on never |
kmixter1
2010/04/30 19:20:12
Isn't having no start on stanza equivalent?
Nick Sanders
2010/05/04 03:41:26
Not sure, but this makes it clear on first glance
|
+ stop on starting halt or starting reboot |
+ |
+ respawn |
+EOF |
+ |
+patch -d ${ROOT_FS_DIR} -Np1 <<EOF |
diff -Naur old/etc/init/dump-boot-stats.conf new/etc/init/dump-boot-stats.conf |
---- old/etc/init/dump-boot-stats.conf 2010-04-05 21:33:11.000000000 -0700 |
-+++ new/etc/init/dump-boot-stats.conf 2010-04-05 21:00:48.000000000 -0700 |
-@@ -7,7 +7,7 @@ |
+--- old/etc/init/dump-boot-stats.conf 2010-04-28 21:35:33.785340000 -0700 |
++++ new/etc/init/dump-boot-stats.conf 2010-04-28 21:36:28.819984000 -0700 |
+@@ -7,7 +7,8 @@ |
# when login-prompt-ready is received, grabs the current uptime and |
# disk stats. Also sends uptime to metrics client for perf dashboard |
-start on login-prompt-ready |
++# start on login-prompt-ready |
Tom Wai-Hong Tam
2010/04/30 02:45:30
Same as above.
|
+start on stopping startup |
# This is run-once rather than a service. |
@@ -30,52 +46,33 @@ cat > ${ROOT_FS_DIR}/etc/init/factory.conf <<EOF |
description "Chrome OS factory startup stub" |
author "chromium-os-dev@googlegroups.com" |
-start on stopping autotest |
+start on started udev |
script |
cd /usr/local/autotest |
+date >> /var/log/factory.log |
if [ ! -e factory_started ]; then |
touch factory_started |
- date >> /var/log/factory.log |
cp -f site_tests/suite_Factory/control.full control |
./bin/autotest control >> /var/log/factory.log 2>&1 |
+else |
+ ./tools/autotest >> /var/log/factory.log 2>&1 |
fi |
end script |
EOF |
-cat > ${ROOT_FS_DIR}/etc/init/autotest.conf <<EOF |
-# Copyright (c) 2010 The Chromium OS Authors. All rights reserved. |
-# Use of this source code is governed by a BSD-style license that can be |
-# found in the LICENSE file. |
- |
-description "Chrome OS autotest startup stub" |
-author "chromium-os-dev@googlegroups.com" |
- |
-start on started udev |
- |
-script |
-# Sleep as the current upstart sequence gives no clear completion signal. |
-# TODO: investigate generating authoritative bootup finished event. |
-sleep 10 |
-cd /usr/local/autotest |
-date >> /var/log/factory.log |
-./tools/autotest >> /var/log/factory.log 2>&1 |
-end script |
-EOF |
- |
-cat > ${ROOT_FS_DIR}/etc/init/tty1.conf <<EOF |
+cat > ${ROOT_FS_DIR}/etc/init/factorylog.conf <<EOF |
# Copyright (c) 2010 The Chromium OS Authors. All rights reserved. |
# Use of this source code is governed by a BSD-style license that can be |
# found in the LICENSE file. |
-start on startup |
+start on started factory |
stop on starting halt or starting reboot |
respawn |
script |
-cd / |
-/sbin/agetty 38400 tty1 linux -l /bin/bash -n |
+tail -F /var/log/factory.log > /dev/tty1 |
Tom Wai-Hong Tam
2010/04/30 02:45:30
"tail -n 48 -F /var/log/factory.log > /dev/tty1" l
kmixter1
2010/04/30 19:20:12
So text mode is up on VT1 until X is started? Who
Nick Sanders
2010/05/04 03:41:26
The keyboard test still starts X, as of now. Tammo
|
end script |
EOF |