rpms/initscripts/OLPC-4 olpc-autologin.patch, NONE, 1.1 olpc-initscripts.patch, NONE, 1.1 olpc-runlevel.patch, NONE, 1.1 olpc-setolpckeys.patch, NONE, 1.1 olpc-xstartup.patch, NONE, 1.1 initscripts.spec, 1.184, 1.185

Thu Nov 13 18:29:38 UTC 2008

Author: ausil

Update of /cvs/pkgs/rpms/initscripts/OLPC-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14081

Modified Files:
	initscripts.spec 
Added Files:
	olpc-autologin.patch olpc-initscripts.patch 
	olpc-runlevel.patch olpc-setolpckeys.patch olpc-xstartup.patch 
Log Message:
apply some olpc patches


olpc-autologin.patch:

--- NEW FILE olpc-autologin.patch ---
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:

--- NEW FILE olpc-initscripts.patch ---
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:

--- NEW FILE olpc-runlevel.patch ---
--- 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:

--- NEW FILE olpc-setolpckeys.patch ---
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:

--- NEW FILE olpc-xstartup.patch ---
--- 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


Index: initscripts.spec
===================================================================
RCS file: /cvs/pkgs/rpms/initscripts/OLPC-4/initscripts.spec,v
retrieving revision 1.184
retrieving revision 1.185
diff -u -r1.184 -r1.185
--- initscripts.spec	11 Nov 2008 16:52:59 -0000	1.184
+++ initscripts.spec	13 Nov 2008 18:29:08 -0000	1.185
@@ -6,10 +6,15 @@
 # ppp-watch is GPLv2+, everything else is GPLv2
 License: GPLv2 and GPLv2+
 Group: System Environment/Base
-Release: 1
+Release: 1%{?dist}.1
 URL: http://fedorahosted.org/releases/i/n/initscripts/
 Source: http://fedorahosted.org/releases/i/n/initscripts/initscripts-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
+Patch0: olpc-initscripts.patch
+Patch1: olpc-autologin.patch
+Patch2: olpc-xstartup.patch
+Patch3: olpc-runlevel.patch
+Patch4: olpc-setolpckeys.patch
 Requires: mingetty, /bin/awk, /bin/sed, mktemp, e2fsprogs >= 1.15
 Requires: /sbin/sysctl, syslog
 Requires: /sbin/fuser, /bin/grep
@@ -61,6 +66,11 @@
 
 %prep
 %setup -q
+%patch0 -p1
+%patch1 -p1
+%patch2 -p1 -b .xstartup
+%patch3 -p1 -b .runlevel
+%patch4 -p1 -b .setolpckeys
 
 %build
 make
@@ -250,6 +260,9 @@
 /etc/profile.d/debug*
 
 %changelog
+* Thu Nov 13 2008 Dennis Gilmore <dennis at ausil.us> - 8.86-1.1
+- apply some of the olpc specifc patches from OLPC-3
+
 * Tue Nov 11 2008 Bill Nottingham <notting at redhat.com> - 8.86-1
 - stop plymouth before stopping the runlevel (#467207)
 - fix get_config_by_subchannel (#459044, <harald at redhat.com>)


