5176e143a3
Split "readonly rootfs / tmpfs" parts of original olpc patch into new
'readonly' patch; plus add additional support for preserving changes to
/etc/ssh, /etc/sysconfig/i18n, /etc/timezone, /var/lib/dbus/machine-id,
and /var/lib/random-seed.
Add "pretty boot" support: bring up localhost before rhgb-client is
invoked; some additional calls to rhgb-client; make sure that we
cleanly exit pretty boot if interactive boot mode is invoked.
44 lines
1.4 KiB
Diff
44 lines
1.4 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-26 19:04:43.000000000 -0400
|
|
+++ initscripts-8.76.2/rc.d/rc 2008-06-26 20:12:30.000000000 -0400
|
|
@@ -43,6 +43,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-26 19:04:43.000000000 -0400
|
|
+++ initscripts-8.76.2/rc.d/rc.sysinit 2008-06-26 20:12:30.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
|