abf189152c
problems.
Change default runlevel to 5 (replacing an uglier patch to do this in our
image creation tool).
Remove a redundant udev console initialization which causes the screen to
flash during prettyboot (dlo trac #3569). This replaces an uglier patch
to do this in our image creation tool.
Set up keymap when hal sees an OLPC keyboard. This replaces an uglier patch
in our image creation tool.
68 lines
2.6 KiB
Diff
68 lines
2.6 KiB
Diff
diff -ruHp initscripts-8.76.2.orig/rc.d/rc initscripts-8.76.2/rc.d/rc
|
|
--- initscripts-8.76.2.orig/rc.d/rc 2008-06-27 17:03:36.000000000 -0400
|
|
+++ initscripts-8.76.2/rc.d/rc 2008-06-27 17:27:07.000000000 -0400
|
|
@@ -29,6 +29,7 @@ export runlevel previous
|
|
|
|
export CONSOLETYPE
|
|
cmdline=$(cat /proc/cmdline)
|
|
+[ -x /etc/rc.d/init.d/0-boot-anim-start ] && cmdline="$cmdline rhgb"
|
|
if ! strstr "$cmdline" rhgb; then
|
|
GRAPHICAL="no"
|
|
export GRAPHICAL
|
|
@@ -43,6 +44,8 @@ UPSTART=
|
|
if [ "$previous" = "N" ]; then
|
|
if [ "$do_confirm" = "yes" ]; then
|
|
echo $"Entering interactive startup"
|
|
+ # bail out of pretty boot
|
|
+ chvt 1
|
|
else
|
|
echo $"Entering non-interactive startup"
|
|
fi
|
|
diff -ruHp initscripts-8.76.2.orig/rc.d/rc.sysinit initscripts-8.76.2/rc.d/rc.sysinit
|
|
--- initscripts-8.76.2.orig/rc.d/rc.sysinit 2008-06-27 17:03:36.000000000 -0400
|
|
+++ initscripts-8.76.2/rc.d/rc.sysinit 2008-06-27 17:03:44.000000000 -0400
|
|
@@ -11,6 +11,14 @@ unamer=`uname -r`
|
|
|
|
set -m
|
|
|
|
+if [ -x /usr/bin/rhgb-client ] ; then
|
|
+ # OLPC's rhgb-client depends on localhost being up
|
|
+ /sbin/ip addr add 127.0.0.1/8 dev lo
|
|
+ /sbin/ip addr add ::1/128 dev lo
|
|
+ /sbin/ip link set lo up
|
|
+ /usr/bin/rhgb-client --update=sysinit-top # early "we're alive" indication
|
|
+fi
|
|
+
|
|
if [ -f /etc/sysconfig/network ]; then
|
|
. /etc/sysconfig/network
|
|
fi
|
|
@@ -284,10 +292,13 @@ if [ -x /bin/taskset ]; then
|
|
fi
|
|
fi
|
|
|
|
+update_boot_stage udev
|
|
+( sleep 3 ; update_boot_stage udev_mid ) &
|
|
nashpid=$(pidof nash 2>/dev/null)
|
|
[ -n "$nashpid" ] && kill $nashpid >/dev/null 2>&1
|
|
unset nashpid
|
|
/sbin/start_udev
|
|
+update_boot_stage udev_post
|
|
|
|
# Load other user-defined modules
|
|
for file in /etc/sysconfig/modules/*.modules ; do
|
|
diff -ruHp initscripts-8.76.2.orig/udev/rules.d/10-console.rules initscripts-8.76.2/udev/rules.d/10-console.rules
|
|
--- initscripts-8.76.2.orig/udev/rules.d/10-console.rules 2008-07-24 12:26:56.000000000 -0400
|
|
+++ initscripts-8.76.2/udev/rules.d/10-console.rules 2008-07-24 12:29:15.000000000 -0400
|
|
@@ -1,5 +1,11 @@
|
|
# Console initialization - keyboard, font, etc.
|
|
-KERNEL=="tty0", RUN+="/lib/udev/console_init %k"
|
|
+# OLPC: commented out to remove tty0 udev initialization, which takes
|
|
+# place during pretty boot and makes the screen flash (dlo trac #3569).
|
|
+# We set up the console ourselves, both in
|
|
+# 96-olpc-keyboard.rules as well as in olpc-configure, and we
|
|
+# set the appropriate font in /etc/init.d/z-boot-anim-stop -- so
|
|
+# this is completely unnecessary.
|
|
+#KERNEL=="tty0", RUN+="/lib/udev/console_init %k"
|
|
|
|
# Check and set up serial and serial-like consoles if necessary
|
|
KERNEL=="console", RUN+="/lib/udev/console_check %k"
|