rpms/initscripts/OLPC-3 initscripts.spec, 1.176, 1.177 olpc-initscripts.patch, 1.2, 1.3

[Dennis Gilmore (ausil)]

Author: ausil

Update of /cvs/pkgs/rpms/initscripts/OLPC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7257

Modified Files:
	initscripts.spec olpc-initscripts.patch 
Log Message:
update for olpc



Index: initscripts.spec
===================================================================
RCS file: /cvs/pkgs/rpms/initscripts/OLPC-3/initscripts.spec,v
retrieving revision 1.176
retrieving revision 1.177
diff -u -r1.176 -r1.177
--- initscripts.spec	16 May 2008 19:31:34 -0000	1.176
+++ initscripts.spec	6 Jun 2008 04:09:48 -0000	1.177
@@ -6,7 +6,7 @@
 # ppp-watch is GPLv2+, everything else is GPLv2
 License: GPLv2 and GPLv2+
 Group: System Environment/Base
-Release: 1.2%{?dist}
+Release: 1.3%{?dist}
 Source: initscripts-%{version}.tar.bz2
 Patch0: olpc-initscripts.patch
 BuildRoot: /%{_tmppath}/%{name}-%{version}-%{release}-root
@@ -240,6 +240,9 @@
 %ghost %attr(0664,root,utmp) /var/run/utmp
 
 %changelog
+* Thu Jun 05 2008 Dennis Gilmore <dennis at ausil.us> - 8.76.2-1.3
+- update olpc patch
+
 * Thu May 15 2008 Dennis Gilmore <dennis at ausil.us> - 8.76.2-1.2
 - update patch for olpc
 

olpc-initscripts.patch:

Index: olpc-initscripts.patch
===================================================================
RCS file: /cvs/pkgs/rpms/initscripts/OLPC-3/olpc-initscripts.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- olpc-initscripts.patch	16 May 2008 19:31:34 -0000	1.2
+++ olpc-initscripts.patch	6 Jun 2008 04:09:48 -0000	1.3
@@ -1,60 +1,22 @@
-diff -Nur initscripts-8.76.2-orig/event.d/olpc-dm initscripts-8.76.2/event.d/olpc-dm
---- initscripts-8.76.2-orig/event.d/olpc-dm	1969-12-31 18:00:00.000000000 -0600
-+++ initscripts-8.76.2/event.d/olpc-dm	2008-05-15 23:24:24.000000000 -0500
-@@ -0,0 +1,12 @@
-+# olpc-dm - start the olpc sugar environment
-+#
-+# Starts olpc sugar 
-+
-+start on stopped rc5
-+
-+stop on runlevel [!5]
-+
-+console output
-+respawn
-+respawn limit 10 120
-+exec /usr/sbin/olpc-dm
-diff -Nur initscripts-8.76.2-orig/event.d/prefdm initscripts-8.76.2/event.d/prefdm
+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	1969-12-31 18:00:00.000000000 -0600
-@@ -1,12 +0,0 @@
++++ 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
--
--start on stopped rc5
--
--stop on runlevel [!5]
--
--console output
--respawn
--respawn limit 10 120
--exec /etc/X11/prefdm -nodaemon
-diff -Nur initscripts-8.76.2-orig/event.d/tty1 initscripts-8.76.2/event.d/tty1
---- initscripts-8.76.2-orig/event.d/tty1	2008-05-15 11:19:26.000000000 -0500
-+++ initscripts-8.76.2/event.d/tty1	2008-05-16 14:23:47.000000000 -0500
-@@ -6,7 +6,7 @@
- start on stopped rc2
- start on stopped rc3
- start on stopped rc4
--start on started prefdm
-+start on started olpc-dm
++# Starts olpc sugar 
  
- stop on runlevel 0
- stop on runlevel 1
-diff -Nur initscripts-8.76.2-orig/event.d/tty2 initscripts-8.76.2/event.d/tty2
---- initscripts-8.76.2-orig/event.d/tty2	2008-05-15 11:19:26.000000000 -0500
-+++ initscripts-8.76.2/event.d/tty2	2008-05-16 14:24:01.000000000 -0500
-@@ -6,7 +6,7 @@
- start on stopped rc2
- start on stopped rc3
- start on stopped rc4
--start on started prefdm
-+start on started olpc-dm
+ start on stopped rc5
  
- stop on runlevel 0
- stop on runlevel 1
-diff -Nur initscripts-8.76.2-orig/event.d/tty3 initscripts-8.76.2/event.d/tty3
+@@ -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 @@
@@ -74,7 +36,7 @@
 -
 -respawn
 -exec /sbin/mingetty tty3
-diff -Nur initscripts-8.76.2-orig/event.d/tty4 initscripts-8.76.2/event.d/tty4
+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 @@
@@ -94,7 +56,7 @@
 -
 -respawn
 -exec /sbin/mingetty tty4
-diff -Nur initscripts-8.76.2-orig/event.d/tty5 initscripts-8.76.2/event.d/tty5
+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 @@
@@ -114,7 +76,7 @@
 -
 -respawn
 -exec /sbin/mingetty tty5
-diff -Nur initscripts-8.76.2-orig/event.d/tty6 initscripts-8.76.2/event.d/tty6
+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 @@
@@ -134,9 +96,9 @@
 -
 -respawn
 -exec /sbin/mingetty tty6
-diff -Nur initscripts-8.76.2-orig/event.d/ttyS0 initscripts-8.76.2/event.d/ttyS0
+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-05-16 14:24:30.000000000 -0500
++++ initscripts-8.76.2/event.d/ttyS0	2008-06-05 23:04:38.000000000 -0500
 @@ -0,0 +1,16 @@
 +# ttyS0 - getty
 +#
@@ -146,7 +108,7 @@
 +start on stopped rc2
 +start on stopped rc3
 +start on stopped rc4
-+start on started olpc-dm
++start on started prefdm
 +
 +stop on runlevel 0
 +stop on runlevel 1