mirrors/flatcar-scripts
1
0
Fork 0
mirror of https://github.com/flatcar/scripts.git synced 2025-08-08 05:26:58 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix factory patching

Browse Source 
BUG=7535
TEST=build factory, no errors, verify patches.

Change-Id: I480633cc7a0824cd2dfab82acd6a82f952cd7daf

Review URL: http://codereview.chromium.org/5332004
This commit is contained in:
Nick Sanders 2010-11-23 22:03:25 -08:00
parent 323b95efd9
commit 1c4026c7a7
2 changed files with 5 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
mod_for_factory_scripts/200patchInitScript
View File

@ -7,32 +7,22 @@
echo "Applying patch to init scripts." echo "Applying patch to init scripts."
touch "${ROOT_FS_DIR}/root/.factory_test" touch "${ROOT_FS_DIR}/root/.factory_test"
patch -d "${ROOT_FS_DIR}" -Np1 <<EOF patch -d "${ROOT_FS_DIR}" -Np1 <<EOF
--- old/etc/init/ui.conf 2010-04-28 21:28:38.886069000 -0700 --- 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 +++ new/etc/init/ui.conf 2010-04-28 21:29:42.676163000 -0700
@@ -5,7 +5,7 @@ @@ -11 +11 @@
description "Chrome OS user interface"
author "chromium-os-dev@googlegroups.com"
-start on stopping startup -start on stopping startup
+start on never +start on never
stop on starting halt or starting reboot
respawn
EOF EOF
patch -d "${ROOT_FS_DIR}" -Np1 <<EOF patch -d "${ROOT_FS_DIR}" -Np1 <<EOF
diff -Naur old/etc/init/boot-complete.conf new/etc/init/boot-complete.conf diff -Naur old/etc/init/boot-complete.conf new/etc/init/boot-complete.conf
--- old/etc/init/boot-complete.conf 2010-07-21 11:22:30.000000000 +0800 --- old/etc/init/boot-complete.conf 2010-07-21 11:22:30.000000000 +0800
+++ new/etc/init/boot-complete.conf 2010-07-21 22:13:36.000000000 +0800 +++ new/etc/init/boot-complete.conf 2010-07-21 22:13:36.000000000 +0800
@@ -7,7 +7,7 @@ @@ -7 +7 @@
# Processing required during boot after login prompt is displayed.
# Primarily, this means calculating boot time statistics.
-start on login-prompt-ready -start on login-prompt-ready
+start on started udev +start on started udev
task
EOF EOF
cat >"${ROOT_FS_DIR}/etc/init/factory.conf" <<EOF cat >"${ROOT_FS_DIR}/etc/init/factory.conf" <<EOF
@ -78,13 +68,7 @@ patch -d "${ROOT_FS_DIR}" -Np1 <<EOF
diff -Nau old/etc/init/chrontel.conf new/etc/init/ diff -Nau old/etc/init/chrontel.conf new/etc/init/
--- old/etc/init/chrontel.conf 2010-08-05 16:32:55.000000000 -0700 --- old/etc/init/chrontel.conf 2010-08-05 16:32:55.000000000 -0700
+++ new/etc/init/chrontel.conf 2010-08-05 16:32:45.000000000 -0700 +++ new/etc/init/chrontel.conf 2010-08-05 16:32:45.000000000 -0700
@@ -7,7 +7,7 @@ @@ -7 +7 @@
# start as early as possible to allow login screen on hdmi
# Need udev to have connected the i2c before we can use it
-start on started udev -start on started udev
+start on never +start on never
stop on starting halt or starting reboot
# sadly, these can't reference each other.
EOF EOF

2
mod_for_factory_scripts/factory_setup.sh
View File

@ -11,5 +11,5 @@ SCRIPT_BASE="${GCLIENT_ROOT}/src/scripts/mod_for_factory_scripts/"
for SCRIPT in "${SCRIPT_BASE}"[0-9][0-9][0-9]*[!$~] for SCRIPT in "${SCRIPT_BASE}"[0-9][0-9][0-9]*[!$~]
do do
echo "Apply $(basename "${SCRIPT}")..." echo "Apply $(basename "${SCRIPT}")..."
"${SCRIPT}" bash -e "${SCRIPT}"
done done