rpms/initscripts/OLPC-2 initscripts-8.54.1-olpc.patch, 1.7, 1.8 initscripts.spec, 1.150, 1.151

[John (J5) Palmieri (johnp)]

Author: johnp

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

Modified Files:
	initscripts-8.54.1-olpc.patch initscripts.spec 
Log Message:
- don't crash if /etc/sysconfig/i18n does not exist


initscripts-8.54.1-olpc.patch:

Index: initscripts-8.54.1-olpc.patch
===================================================================
RCS file: /cvs/pkgs/rpms/initscripts/OLPC-2/initscripts-8.54.1-olpc.patch,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- initscripts-8.54.1-olpc.patch	13 Sep 2007 17:38:58 -0000	1.7
+++ initscripts-8.54.1-olpc.patch	18 Sep 2007 15:33:15 -0000	1.8
@@ -1,6 +1,6 @@
 diff -up initscripts-8.54.1/rwtab.olpc initscripts-8.54.1/rwtab
 --- initscripts-8.54.1/rwtab.olpc	2007-04-13 18:44:55.000000000 -0400
-+++ initscripts-8.54.1/rwtab	2007-09-11 18:33:31.000000000 -0400
++++ initscripts-8.54.1/rwtab	2007-09-13 13:31:32.000000000 -0400
 @@ -24,10 +24,7 @@ empty	/var/tux
  empty	/media
  
@@ -19,7 +19,7 @@
 +files   /home/olpc/.Xauthority
 diff -up initscripts-8.54.1/inittab.olpc initscripts-8.54.1/inittab
 --- initscripts-8.54.1/inittab.olpc	2006-10-12 13:51:04.000000000 -0400
-+++ initscripts-8.54.1/inittab	2007-09-11 18:33:31.000000000 -0400
++++ initscripts-8.54.1/inittab	2007-09-13 13:31:32.000000000 -0400
 @@ -15,7 +15,7 @@
  #   5 - X11
  #   6 - reboot (Do NOT set initdefault to this)
@@ -43,9 +43,9 @@
 -x:5:respawn:/etc/X11/prefdm -nodaemon
 +x:5:respawn:/sbin/olpc-dm
 diff -up /dev/null initscripts-8.54.1/src/olpc-dm.c
---- /dev/null	2007-09-13 09:21:47.113128415 -0400
-+++ initscripts-8.54.1/src/olpc-dm.c	2007-09-13 13:29:21.000000000 -0400
-@@ -0,0 +1,568 @@
+--- /dev/null	2007-09-18 09:50:57.766542723 -0400
++++ initscripts-8.54.1/src/olpc-dm.c	2007-09-18 11:30:44.000000000 -0400
+@@ -0,0 +1,571 @@
 +#include <unistd.h>
 +#include <stdio.h>
 +#include <stdlib.h>
@@ -220,6 +220,9 @@
 +  char *line;
 +
 +  f = fopen("/etc/sysconfig/i18n", "r");
++  if (!f)
++    return;
++
 +  while(fscanf(f, "%as", &line)==1)
 +    {
 +      char *sline;
@@ -616,7 +619,7 @@
 +}
 diff -up initscripts-8.54.1/src/Makefile.olpc initscripts-8.54.1/src/Makefile
 --- initscripts-8.54.1/src/Makefile.olpc	2006-09-27 15:59:05.000000000 -0400
-+++ initscripts-8.54.1/src/Makefile	2007-09-11 18:33:31.000000000 -0400
++++ initscripts-8.54.1/src/Makefile	2007-09-13 13:31:32.000000000 -0400
 @@ -1,7 +1,8 @@
  CFLAGS+=$(RPM_OPT_FLAGS) -Wall -D_GNU_SOURCE
  


Index: initscripts.spec
===================================================================
RCS file: /cvs/pkgs/rpms/initscripts/OLPC-2/initscripts.spec,v
retrieving revision 1.150
retrieving revision 1.151
diff -u -r1.150 -r1.151
--- initscripts.spec	13 Sep 2007 17:38:58 -0000	1.150
+++ initscripts.spec	18 Sep 2007 15:33:15 -0000	1.151
@@ -3,7 +3,7 @@
 Version: 8.54.1
 License: GPL
 Group: System Environment/Base
-Release: 7%{?dist} 
+Release: 8%{?dist} 
 Source: initscripts-%{version}.tar.bz2
 Source1: olpc-login
 Patch0: initscripts-8.54.1-olpc.patch
@@ -207,6 +207,9 @@
 %{_sysconfdir}/pam.d/olpc-login
 
 %changelog
+* Tue Sep 18 2007 John (J5) Palmieri <johnp at redhat.com> 8.54.1-8
+- don't crash if /etc/sysconfig/i18n does not exist
+
 * Thu Sep 11 2007 John (J5) Palmieri <johnp at redhat.com> 8.54.1-7
 - fix crasher bug in olpc-dm