dist-git conversion

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.

.cvsignore

@@ -1 +0,0 @@
-initscripts-8.60.tar.bz2

.gitignore

@@ -0,0 +1 @@
+initscripts-8.76.2.tar.bz2

Makefile

@@ -1,6 +0,0 @@
-# Makefile for source rpm: initscripts
-# $Id$
-NAME := initscripts
-SPECFILE = $(firstword $(wildcard *.spec))
-
-include ../common/Makefile.common

initscripts-8.76.2-prettyboot.patch

@@ -0,0 +1,68 @@
+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"

initscripts-8.76.2-readonly.patch

@@ -0,0 +1,45 @@
+diff -ruHp initscripts-8.76.2.orig/rwtab initscripts-8.76.2/rwtab
+--- initscripts-8.76.2.orig/rwtab	2008-06-26 19:04:43.000000000 -0400
++++ initscripts-8.76.2/rwtab	2008-06-26 20:07:04.000000000 -0400
+@@ -24,9 +24,7 @@ empty	/var/tux
+ empty	/media
+ 
+ files	/etc/adjtime
+-files	/etc/mtab
+ files	/etc/ntp.conf
+-files	/etc/resolv.conf
+ files	/etc/lvm/.cache
+ files	/etc/lvm/archive
+ files	/etc/lvm/backup
+diff -ruHp initscripts-8.76.2.orig/statetab initscripts-8.76.2/statetab
+--- initscripts-8.76.2.orig/statetab	2008-06-26 19:04:43.000000000 -0400
++++ initscripts-8.76.2/statetab	2008-06-26 20:08:03.000000000 -0400
+@@ -10,3 +10,8 @@
+ #   /etc/ssh
+ #   /var/spool/mail
+ #
++/etc/ssh
++/etc/sysconfig/i18n
++/etc/timezone
++/var/lib/dbus
++/var/lib/random-seed
+diff -ruHp initscripts-8.76.2.orig/sysconfig/readonly-root initscripts-8.76.2/sysconfig/readonly-root
+--- initscripts-8.76.2.orig/sysconfig/readonly-root	2008-06-26 19:04:43.000000000 -0400
++++ initscripts-8.76.2/sysconfig/readonly-root	2008-06-26 20:08:03.000000000 -0400
+@@ -2,7 +2,7 @@
+ READONLY=no
+ # Set to 'yes' to mount various temporary state as either tmpfs
+ # or on the block device labelled RW_LABEL. Implied by READONLY
+-TEMPORARY_STATE=no
++TEMPORARY_STATE=yes
+ # Place to put a tmpfs for temporary scratch writable space
+ RW_MOUNT=/var/lib/stateless/writable
+ # Label on local filesystem which can be used for temporary scratch space
+@@ -12,6 +12,6 @@ RW_OPTIONS=
+ # Label for partition with persistent data
+ STATE_LABEL=stateless-state
+ # Where to mount to the persistent data
+-STATE_MOUNT=/var/lib/stateless/state
++STATE_MOUNT=/security/state
+ # Options to use for peristent mount
+ STATE_OPTIONS=

initscripts.spec

@@ -1,24 +1,41 @@
+%define with_upstart 1%{nil} 
+
 Summary: The inittab file and the /etc/init.d scripts
 Name: initscripts
-Version: 8.60
+Version: 8.76.2
 # ppp-watch is GPLv2+, everything else is GPLv2
 License: GPLv2 and GPLv2+
 Group: System Environment/Base
-Release: 1
+Release: 1%{?dist}.7
 Source: initscripts-%{version}.tar.bz2
+Patch0: olpc-initscripts.patch
+Patch1: olpc-autologin.patch
+Patch2: initscripts-8.76.2-readonly.patch
+Patch3: initscripts-8.76.2-prettyboot.patch
+Patch4: olpc-xstartup.patch
+Patch5: olpc-runlevel.patch
+Patch6: olpc-setolpckeys.patch
 BuildRoot: /%{_tmppath}/%{name}-%{version}-%{release}-root
 Requires: mingetty, /bin/awk, /bin/sed, mktemp, e2fsprogs >= 1.15
 Requires: /sbin/sysctl, syslog
 Requires: /sbin/fuser, /bin/grep
+Requires: /sbin/pidof
 Requires: module-init-tools
 Requires: util-linux >= 2.10s-11, mount >= 2.11l
-Requires: bash >= 3.0, SysVinit >= 2.85-38
-Requires: /sbin/ip, /sbin/arping, net-tools
+Requires: bash >= 3.0
+%if with_upstart
+Requires: upstart
+Obsoletes: event-compat-sysv
+%else
+Requires: SysVinit >= 2.85-38
+%endif
+Requires: /sbin/ip, /sbin/arping, net-tools, /bin/find
 Requires: /etc/redhat-release, dev
 Requires: ethtool >= 1.8-2, /sbin/runuser
 Requires: udev >= 115-1
 Requires: popt >= 1.12-2
-Conflicts: mkinitrd < 4.0, kernel < 2.6.12
+Requires: cpio, findutils
+Conflicts: mkinitrd < 4.0, kernel < 2.6.12, mdadm < 2.6.4-3
 Conflicts: ypbind < 1.6-12, psacct < 6.3.2-12, kbd < 1.06-19, lokkit < 0.50-14
 Conflicts: dhclient < 3.0.3-7
 Conflicts: tcsh < 6.13-5
@@ -39,6 +56,17 @@ deactivate most network interfaces.
 
 %prep
 %setup -q
+%patch0 -p1 
+%patch1 -p1 
+%patch2 -p1 -b .readonly
+%patch3 -p1 -b .prettyboot
+%patch4 -p1 -b .xstartup
+%patch5 -p1 -b .runlevel
+%patch6 -p1 -b .setolpckeys
+# clean up patch backup files which would otherwise get copied into the
+# RPM.
+rm -f udev/rules.d/*.prettyboot udev/rules.d/*.setolpckeys
+rm -f event.d/*.xstartup
 
 %build
 make
@@ -49,6 +77,16 @@ make ROOT=$RPM_BUILD_ROOT SUPERUSER=`id -un` SUPERGROUP=`id -gn` mandir=%{_mandi
 
 %find_lang %{name}
 
+%if with_upstart
+ mv -f $RPM_BUILD_ROOT/etc/inittab.upstart $RPM_BUILD_ROOT/etc/inittab
+ rm -f $RPM_BUILD_ROOT/etc/rc.d/rc1.d/S99single
+ rm -f $RPM_BUILD_ROOT/etc/rc.d/init.d/single
+%else
+ mv -f $RPM_BUILD_ROOT/etc/inittab.sysv $RPM_BUILD_ROOT/etc/inittab
+ rm -rf $RPM_BUILD_ROOT/etc/event.d
+%endif
+rm -f $RPM_BUILD_ROOT/etc/inittab.*
+
 %ifnarch s390 s390x
 rm -f \
  $RPM_BUILD_ROOT/etc/sysconfig/network-scripts/ifup-ctc \
@@ -154,6 +192,9 @@ rm -rf $RPM_BUILD_ROOT
 %dir /etc/rwtab.d
 /etc/statetab
 %dir /etc/statetab.d
+%if with_upstart
+%config(noreplace) /etc/event.d/*
+%endif
 /etc/udev/rules.d/*
 %config /etc/X11/prefdm
 %config(noreplace) /etc/inittab
@@ -182,9 +223,12 @@ rm -rf $RPM_BUILD_ROOT
 /sbin/fstab-decode
 /sbin/genhostid
 /sbin/getkey
+/sbin/securetty
 %attr(2755,root,root) /sbin/netreport
 /sbin/initlog
 /lib/udev/rename_device
+/lib/udev/console_init
+/lib/udev/console_check
 %ifarch s390 s390x
 /lib/udev/ccw_init
 %endif
@@ -201,13 +245,158 @@ rm -rf $RPM_BUILD_ROOT
 %config /etc/ppp/ipv6-up
 %config /etc/ppp/ipv6-down
 %config /etc/initlog.conf
-%doc sysconfig.txt sysvinitfiles ChangeLog static-routes-ipv6 ipv6-tunnel.howto ipv6-6to4.howto changes.ipv6 COPYING
+%dir /etc/NetworkManager
+%dir /etc/NetworkManager/dispatcher.d
+/etc/NetworkManager/dispatcher.d/00-netreport
+/etc/NetworkManager/dispatcher.d/05-netfs
+%doc sysconfig.txt sysvinitfiles ChangeLog static-routes-ipv6 ipv6-tunnel.howto ipv6-6to4.howto changes.ipv6 COPYING README-event.d
 /var/lib/stateless
 %ghost %attr(0600,root,utmp) /var/log/btmp
 %ghost %attr(0664,root,utmp) /var/log/wtmp
 %ghost %attr(0664,root,utmp) /var/run/utmp
 
 %changelog
+* Wed Jul 23 2008 C. Scott Ananian <cscott@laptop.org> - 8.76.2-1.7
+- Unfreeze DCON after failed X start, and fail more quickly when there
+  are 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.
+
+* Sat Jun 28 2008 C. Scott Ananian <cscott@laptop.org> - 8.76.2-1.6
+- Turn on graphical boot by default to generate proper rhgb messages for
+  pretty boot.
+
+* Thu Jun 26 2008 C. Scott Ananian <cscott@laptop.org> - 8.76.2-1.5
+- Turn on stateless support for OLPC; preserve /etc/ssh, /etc/sysconfig/i18n,
+  /etc/timezone, /var/lib/dbus/machine-id, and /var/lib/random-seed.
+- Add better support for pretty boot: 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.
+
+* Fri Jun 13 2008 Dennis Gilmore <dennis@ausil.us> - 8.76.2-1.4
+- add patch to autologin 
+
+* Thu Jun 05 2008 Dennis Gilmore <dennis@ausil.us> - 8.76.2-1.3
+- update olpc patch
+
+* Thu May 15 2008 Dennis Gilmore <dennis@ausil.us> - 8.76.2-1.2
+- update patch for olpc
+
+* Thu May 15 2008 Dennis Gilmore <dennis@ausil.us> - 8.76.2-1.1
+- apply patch for olpc
+
+* Thu May 15 2008 Bill Nottingham <notting@redhat.com> - 8.76.2-
+- Don't unmount sysfs in halt. (#446292)
+
+* Wed May 14 2008 Peter Jones <pjones@redhat.com>
+- init.d/functions: fix resolve_dm_raid() for older dmraid configs
+
+* Wed May  7 2008 Bill Nottingham <notting@redhat.com> - 8.76.1-1
+- NMDispatcher/05-netfs: fix check for default route (#445509)
+
+* Fri May  2 2008 Bill Nottingham <notting@redhat.com> - 8.76-1
+- fix tcsh syntax error (#444998)
+- remove debugging cruft from rcS-sulogin
+
+* Tue Apr 29 2008 Bill Nottingham <notting@redhat.com> - 8.74-1
+- use full path to /sbin/ip in NetworkManagerDispatcher script (#444378)
+- lang.{sh,csh}: read only user customization if LANG is already set (#372151)
+
+* Fri Apr 25 2008 Bill Nottingham <notting@redhat.com> - 8.73-1
+- move event-compat-sysv events here, obsolete it
+- fix ctrl-alt-del during rc.sysinit (#444050)
+- fix 'telinit X' from single-user mode (#444001)
+
+* Thu Apr 24 2008 Bill Nottingham <notting@redhat.com> - 8.72-1
+- don't have a S99single when using upstart (#444001, indirectly)
+
+* Wed Apr 23 2008 Bill Nottingham <notting@redhat.com> - 8.71-1
+- adjust to gdm using LANG instead of GDM_LANG (#372151, <rstrode@redhat.com>)
+- rework netfs' check for networking availability to properly handle both network
+  and NetworkManager
+
+* Tue Apr 15 2008 Bill Nottingham <notting@redhat.com> - 8.70-1
+- find is now in /bin. Use it. (#192991, #239914, #244941, #442178)
+- require event-compat-sysv for now (#442291)
+- fix serial event to wait properly
+- handle encrypted LVs properly (#441728)
+- add a sit tunnel type (#441635)
+- translation updates: ru
+
+* Tue Apr  8 2008 Bill Nottingham <notting@redhat.com> - 8.69-1
+- Bring up lo whenever it shows up, not just in network/NM
+- fix shutdown-related oddities (#438444)
+- translation updates: el, sr, sr@latin, sv
+
+* Fri Apr  4 2008 Bill Nottingham <notting@redhat.com> - 8.68-1
+- netfs: umount 'ncp' filesystems as well (#437117)
+- improve performance of s390 ccw rules (#437110, <mernst@de.ibm.com>)
+- fix consoletype environment leak (#439546)
+- ifdown-eth: make sure NEWCONFIG exists before grepping for it (#390271, continued)
+- console_check: always open with NONBLOCK, clear the serial structs first,
+  handle non-16550 ports (<dwmw2@infradead.org>)
+- halt: don't use /etc/sysconfig/clock (#438337)
+- ifup: don't attempt to re-enslave already-enslaved devices (#440077)
+- netfs: run as a NetworkManagerDispatcher script (#439242)
+- netfs: remove $local_fs from the list of provides (making it implicitly provided
+  by booting)
+- serial: add a crude hack to wait for runlevels to finish (#437379)
+- serial: frob /etc/securetty when necessary (#437381)
+- add a upstart-specific inittab
+- translation updates: as, bn_IN, cs, de, es, fi, fr, gu, hi, it, ja, kn, ml, mr, nb,
+  nl, pa, pl, pt_BR, ru, sk, sr, ta, te, zh_CN
+
+* Tue Mar 11 2008 Bill Nottingham <notting@redhat.com> - 8.67-1
+- actually, don't
+
+* Tue Mar 11 2008 Bill Nottingham <notting@redhat.com> - 8.66-1
+- use upstart to start rhgb (#433156, <cdahlin@ncsu.edu>)
+
+* Mon Mar 10 2008 Bill Nottingham <notting@redhat.com> - 8.65-1
+- Add a serial console udev/upstart handler (#434764, indirectly)
+- Add some upstart notification for sysv scripts (modified from <cjdahlin@ncsu.edu>, #431231)
+- Handle _rnetdev correctly (#435358, <pjones@redhat.com>)
+- various minor speedups (<arjan@infradead.org>)
+- translation updates: el, fr
+- disable network by default, in favor of NetworkManager
+
+* Tue Feb 26 2008 Bill Nottingham <notting@redhat.com> - 8.64-1
+- Add a console_init udev helper to do console initialization
+- add /sbin/pidof requirement (#434863)
+
+* Fri Feb  1 2008 Bill Nottingham <notting@redhat.com> - 8.63-1
+- don't start RAID arrays in rc.sysinit, that's done by udev (corollary of #429604)
+- add a NetworkManager-dispatcher script that does netreport on interface changes
+- use udev rules to set the clock, avoiding issues with modular rtcs (#290731)
+
+* Mon Jan 21 2008 Bill Nottingham <notting@redhat.com> - 8.62-1
+- rc.d/rc.sysinit: fix syntax error (#429556)
+- migrate sr@Latn -> sr@latin (<kmilos@gmail.com>)
+
+* Fri Jan 18 2008 Bill Nottingham <notting@redhat.com> - 8.61-1
+- use lvm, not lvm.static (#429222)
+- ifup-eth: don't do something odd if we find a mac address that
+  matches the user-set MACADDR (#251415)
+- rc.sysinit: fix root fs check to catch 'rw,ordered,noatime,etc.' properly
+  (#334171)
+- rc.sysinit: Use proper invocations for authconfig, system-config-network
+  (#426372, #428202)
+- service: handle unreadable scripts (#427767)
+- initscripts.spec: add requirements for stateless
+- fix perms on /etc/profile.d (#407531, <ville.skytta@iki.fi>)
+- rename_device: handle quoted HWADDR, etc. in ifcfg scripts (#351291)
+- minor stateless fixes
+- Makefile cleanups (from OLPC, <cscott@cscott.net>)
+- translation updates: fr, ru, nb
+- don't endelessly loop on ifdown (#390271)
+- rc.sysinit: - fix encrypted swap partitions with random key
+  (<harald@redhat.com>)
+
 * Tue Oct  9 2007 Bill Nottingham <notting@redhat.com> - 8.60-1
 - don't chvt with rhgb - just kill it when needed
 

olpc-autologin.patch

@@ -0,0 +1,27 @@
+diff -NurP a/event.d/tty1 b/event.d/tty1
+--- a/event.d/tty1	2008-05-15 12:19:26.000000000 -0400
++++ b/event.d/tty1	2008-06-10 23:17:02.000000000 -0400
+@@ -13,4 +13,4 @@
+ stop on runlevel 6
+ 
+ respawn
+-exec /sbin/mingetty tty1
++exec /sbin/mingetty --loginpause --autologin root --noclear tty1
+diff -NurP a/event.d/tty2 b/event.d/tty2
+--- a/event.d/tty2	2008-05-15 12:19:26.000000000 -0400
++++ b/event.d/tty2	2008-06-10 23:17:18.000000000 -0400
+@@ -13,4 +13,4 @@
+ stop on runlevel 6
+ 
+ respawn
+-exec /sbin/mingetty tty2
++exec /sbin/mingetty --loginpause --autologin root --noclear tty2
+diff -NurP a/event.d/ttyS0 b/event.d/ttyS0
+--- a/event.d/ttyS0	2008-06-10 23:15:58.000000000 -0400
++++ b/event.d/ttyS0	2008-06-10 23:23:57.000000000 -0400
+@@ -13,4 +13,4 @@
+ stop on runlevel 6
+ 
+ respawn
+-exec /sbin/agetty -w -n ttyS0 115200 vt100
++exec /sbin/agetty -l /bin/bash -w -n ttyS0 115200 vt100

olpc-initscripts.patch

@@ -0,0 +1,124 @@
+diff -Nru initscripts-8.76.2-orig/event.d/prefdm initscripts-8.76.2/event.d/prefdm
+--- initscripts-8.76.2-orig/event.d/prefdm	2008-05-15 11:19:26.000000000 -0500
++++ initscripts-8.76.2/event.d/prefdm	2008-06-05 23:03:53.000000000 -0500
+@@ -1,6 +1,6 @@
+-# prefdm - preferred display manager
++# prefdm - start the olpc sugar environment
+ #
+-# Starts gdm/xdm/etc by preference
++# Starts olpc sugar 
+ 
+ start on stopped rc5
+ 
+@@ -9,4 +9,4 @@
+ console output
+ respawn
+ respawn limit 10 120
+-exec /etc/X11/prefdm -nodaemon
++exec /usr/sbin/olpc-dm
+diff -Nru initscripts-8.76.2-orig/event.d/tty3 initscripts-8.76.2/event.d/tty3
+--- initscripts-8.76.2-orig/event.d/tty3	2008-05-15 11:19:26.000000000 -0500
++++ initscripts-8.76.2/event.d/tty3	1969-12-31 18:00:00.000000000 -0600
+@@ -1,16 +0,0 @@
+-# tty3 - getty
+-#
+-# This service maintains a getty on tty3 from the point the system is
+-# started until it is shut down again.
+-
+-start on stopped rc2
+-start on stopped rc3
+-start on stopped rc4
+-start on started prefdm
+-
+-stop on runlevel 0
+-stop on runlevel 1
+-stop on runlevel 6
+-
+-respawn
+-exec /sbin/mingetty tty3
+diff -Nru initscripts-8.76.2-orig/event.d/tty4 initscripts-8.76.2/event.d/tty4
+--- initscripts-8.76.2-orig/event.d/tty4	2008-05-15 11:19:26.000000000 -0500
++++ initscripts-8.76.2/event.d/tty4	1969-12-31 18:00:00.000000000 -0600
+@@ -1,16 +0,0 @@
+-# tty4 - getty
+-#
+-# This service maintains a getty on tty4 from the point the system is
+-# started until it is shut down again.
+-
+-start on stopped rc2
+-start on stopped rc3
+-start on stopped rc4
+-start on started prefdm
+-
+-stop on runlevel 0
+-stop on runlevel 1
+-stop on runlevel 6
+-
+-respawn
+-exec /sbin/mingetty tty4
+diff -Nru initscripts-8.76.2-orig/event.d/tty5 initscripts-8.76.2/event.d/tty5
+--- initscripts-8.76.2-orig/event.d/tty5	2008-05-15 11:19:26.000000000 -0500
++++ initscripts-8.76.2/event.d/tty5	1969-12-31 18:00:00.000000000 -0600
+@@ -1,16 +0,0 @@
+-# tty5 - getty
+-#
+-# This service maintains a getty on tty5 from the point the system is
+-# started until it is shut down again.
+-
+-start on stopped rc2
+-start on stopped rc3
+-start on stopped rc4
+-start on started prefdm
+-
+-stop on runlevel 0
+-stop on runlevel 1
+-stop on runlevel 6
+-
+-respawn
+-exec /sbin/mingetty tty5
+diff -Nru initscripts-8.76.2-orig/event.d/tty6 initscripts-8.76.2/event.d/tty6
+--- initscripts-8.76.2-orig/event.d/tty6	2008-05-15 11:19:26.000000000 -0500
++++ initscripts-8.76.2/event.d/tty6	1969-12-31 18:00:00.000000000 -0600
+@@ -1,16 +0,0 @@
+-# tty6 - getty
+-#
+-# This service maintains a getty on tty6 from the point the system is
+-# started until it is shut down again.
+-
+-start on stopped rc2
+-start on stopped rc3
+-start on stopped rc4
+-start on started prefdm
+-
+-stop on runlevel 0
+-stop on runlevel 1
+-stop on runlevel 6
+-
+-respawn
+-exec /sbin/mingetty tty6
+diff -Nru initscripts-8.76.2-orig/event.d/ttyS0 initscripts-8.76.2/event.d/ttyS0
+--- initscripts-8.76.2-orig/event.d/ttyS0	1969-12-31 18:00:00.000000000 -0600
++++ initscripts-8.76.2/event.d/ttyS0	2008-06-05 23:04:38.000000000 -0500
+@@ -0,0 +1,16 @@
++# ttyS0 - getty
++#
++# This service maintains a getty on ttyS0 from the point the system is
++# started until it is shut down again.
++
++start on stopped rc2
++start on stopped rc3
++start on stopped rc4
++start on started prefdm
++
++stop on runlevel 0
++stop on runlevel 1
++stop on runlevel 6
++
++respawn
++exec /sbin/agetty -w -n ttyS0 115200 vt100
+Binary files initscripts-8.76.2-orig/src/doexec and initscripts-8.76.2/src/doexec differ
+Binary files initscripts-8.76.2-orig/src/netreport and initscripts-8.76.2/src/netreport differ
+Binary files initscripts-8.76.2-orig/src/testd and initscripts-8.76.2/src/testd differ
+Binary files initscripts-8.76.2-orig/src/usernetctl and initscripts-8.76.2/src/usernetctl differ
+Binary files initscripts-8.76.2-orig/src/usernetctl.o and initscripts-8.76.2/src/usernetctl.o differ
+Binary files initscripts-8.76.2-orig/src/usleep.o and initscripts-8.76.2/src/usleep.o differ

olpc-runlevel.patch

@@ -0,0 +1,8 @@
+--- initscripts-8.76.2/inittab.upstart.orig	2008-07-23 13:47:33.000000000 -0400
++++ initscripts-8.76.2/inittab.upstart	2008-07-23 13:47:51.000000000 -0400
+@@ -23,4 +23,4 @@
+ #   5 - X11
+ #   6 - reboot (Do NOT set initdefault to this)
+ # 
+-id:3:initdefault:
++id:5:initdefault:

olpc-setolpckeys.patch

@@ -0,0 +1,5 @@
+diff -ruHpN initscripts-8.76.2.orig/udev/rules.d/96-olpc-keyboard.rules initscripts-8.76.2/udev/rules.d/96-olpc-keyboard.rules
+--- initscripts-8.76.2.orig/udev/rules.d/96-olpc-keyboard.rules	1969-12-31 19:00:00.000000000 -0500
++++ initscripts-8.76.2/udev/rules.d/96-olpc-keyboard.rules	2008-07-24 12:44:36.000000000 -0400
+@@ -0,0 +1 @@
++ACTION=="add", SYSFS{name}=="AT Translated Set 2 keyboard", KERNEL=="event*", RUN+="/usr/sbin/setolpckeys /dev/input/%k"

olpc-xstartup.patch

@@ -0,0 +1,14 @@
+--- initscripts-8.76.2/event.d/prefdm.orig	2008-07-23 19:34:18.000000000 -0400
++++ initscripts-8.76.2/event.d/prefdm	2008-07-23 19:35:13.000000000 -0400
+@@ -8,5 +8,10 @@
+ 
+ console output
+ respawn
+-respawn limit 10 120
++respawn limit 3 120
+ exec /usr/sbin/olpc-dm
++
++# make sure dcon is unfrozen if something goes wrong.
++post-stop script
++  echo 0 > /sys/devices/platform/dcon/freeze
++end script

sources

@@ -1 +1 @@
-a0e888cc91ef6350a991985567d21366  initscripts-8.60.tar.bz2
+378cbe22e62ddb6e6323bf342853b628  initscripts-8.76.2.tar.bz2