| OLD | NEW |
| 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 patch -d "${ROOT_FS_DIR}" -Np1 <<EOF | 11 patch -d "${ROOT_FS_DIR}" -Np1 <<EOF |
| 11 --- old/etc/init/ui.conf 2010-04-28 21:28:38.886069000 -0700 | 12 --- 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 | 13 +++ new/etc/init/ui.conf 2010-04-28 21:29:42.676163000 -0700 |
| 13 @@ -5,7 +5,7 @@ | 14 @@ -11 +11 @@ |
| 14 description "Chrome OS user interface" | |
| 15 author "chromium-os-dev@googlegroups.com" | |
| 16 | |
| 17 -start on stopping startup | 15 -start on stopping startup |
| 18 +start on never | 16 +start on never |
| 19 stop on starting halt or starting reboot | |
| 20 | |
| 21 respawn | |
| 22 EOF | 17 EOF |
| 23 | 18 |
| 24 patch -d "${ROOT_FS_DIR}" -Np1 <<EOF | 19 patch -d "${ROOT_FS_DIR}" -Np1 <<EOF |
| 25 diff -Naur old/etc/init/boot-complete.conf new/etc/init/boot-complete.conf | 20 diff -Naur old/etc/init/boot-complete.conf new/etc/init/boot-complete.conf |
| 26 --- old/etc/init/boot-complete.conf 2010-07-21 11:22:30.000000000 +0800 | 21 --- 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 | 22 +++ new/etc/init/boot-complete.conf 2010-07-21 22:13:36.000000000 +0800 |
| 28 @@ -7,7 +7,7 @@ | 23 @@ -7 +7 @@ |
| 29 # Processing required during boot after login prompt is displayed. | |
| 30 # Primarily, this means calculating boot time statistics. | |
| 31 | |
| 32 -start on login-prompt-ready | 24 -start on login-prompt-ready |
| 33 +start on started udev | 25 +start on started udev |
| 34 | |
| 35 task | |
| 36 EOF | 26 EOF |
| 37 | 27 |
| 38 cat >"${ROOT_FS_DIR}/etc/init/factory.conf" <<EOF | 28 cat >"${ROOT_FS_DIR}/etc/init/factory.conf" <<EOF |
| 39 # Copyright (c) 2010 The Chromium OS Authors. All rights reserved. | 29 # 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 | 30 # Use of this source code is governed by a BSD-style license that can be |
| 41 # found in the LICENSE file. | 31 # found in the LICENSE file. |
| 42 | 32 |
| 43 description "Chrome OS factory startup stub" | 33 description "Chrome OS factory startup stub" |
| 44 author "chromium-os-dev@googlegroups.com" | 34 author "chromium-os-dev@googlegroups.com" |
| 45 | 35 |
| (...skipping 25 matching lines...) Expand all Loading... |
| 71 respawn | 61 respawn |
| 72 script | 62 script |
| 73 tail -n 48 -F /var/log/factory.log >/dev/tty3 | 63 tail -n 48 -F /var/log/factory.log >/dev/tty3 |
| 74 end script | 64 end script |
| 75 EOF | 65 EOF |
| 76 | 66 |
| 77 patch -d "${ROOT_FS_DIR}" -Np1 <<EOF | 67 patch -d "${ROOT_FS_DIR}" -Np1 <<EOF |
| 78 diff -Nau old/etc/init/chrontel.conf new/etc/init/ | 68 diff -Nau old/etc/init/chrontel.conf new/etc/init/ |
| 79 --- old/etc/init/chrontel.conf 2010-08-05 16:32:55.000000000 -0700 | 69 --- 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 | 70 +++ new/etc/init/chrontel.conf 2010-08-05 16:32:45.000000000 -0700 |
| 81 @@ -7,7 +7,7 @@ | 71 @@ -7 +7 @@ |
| 82 | |
| 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 | |
| 85 -start on started udev | 72 -start on started udev |
| 86 +start on never | 73 +start on never |
| 87 stop on starting halt or starting reboot | |
| 88 | |
| 89 # sadly, these can't reference each other. | |
| 90 EOF | 74 EOF |
| OLD | NEW |