rpms/initscripts/OLPC-2 initscripts-8.54.1-olpc.patch, 1.1, 1.2 initscripts.spec, 1.143, 1.144

[John (J5) Palmieri (johnp)]

Author: johnp

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

Modified Files:
	initscripts-8.54.1-olpc.patch initscripts.spec 
Log Message:
- fix rwtab to not have resolv.conf which screws up NetworkManager


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.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- initscripts-8.54.1-olpc.patch	9 Aug 2007 21:26:12 -0000	1.1
+++ initscripts-8.54.1-olpc.patch	13 Aug 2007 19:43:42 -0000	1.2
@@ -1,5 +1,15 @@
+--- initscripts-8.54.1/rwtab.olpc	2007-08-13 15:31:05.000000000 -0400
++++ initscripts-8.54.1/rwtab	2007-08-13 15:32:57.000000000 -0400
+@@ -27,7 +27,6 @@ files	/etc/adjtime
+ files	/etc/fstab
+ files	/etc/mtab
+ files	/etc/ntp.conf
+-files	/etc/resolv.conf
+ files	/etc/lvm/.cache
+ files	/etc/lvm/archive
+ files	/etc/lvm/backup
 --- initscripts-8.54.1/inittab.olpc	2006-10-12 13:51:04.000000000 -0400
-+++ initscripts-8.54.1/inittab	2007-08-08 18:50:45.000000000 -0400
++++ initscripts-8.54.1/inittab	2007-08-09 18:15:11.000000000 -0400
 @@ -15,7 +15,7 @@
  #   5 - X11
  #   6 - reboot (Do NOT set initdefault to this)
@@ -22,8 +32,8 @@
  # Run xdm in runlevel 5
 -x:5:respawn:/etc/X11/prefdm -nodaemon
 +x:5:respawn:/sbin/olpc-dm
---- /dev/null	2007-08-06 13:44:09.062126627 -0400
-+++ initscripts-8.54.1/src/olpc-dm.c	2007-08-09 17:22:01.000000000 -0400
+--- /dev/null	2007-08-09 20:48:29.426751273 -0400
++++ initscripts-8.54.1/src/olpc-dm.c	2007-08-09 18:15:11.000000000 -0400
 @@ -0,0 +1,595 @@
 +#include <unistd.h>
 +#include <stdio.h>
@@ -621,7 +631,7 @@
 +  return 0;
 +}
 --- initscripts-8.54.1/src/Makefile.olpc	2006-09-27 15:59:05.000000000 -0400
-+++ initscripts-8.54.1/src/Makefile	2007-08-09 13:50:38.000000000 -0400
++++ initscripts-8.54.1/src/Makefile	2007-08-09 18:15:11.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.143
retrieving revision 1.144
diff -u -r1.143 -r1.144
--- initscripts.spec	9 Aug 2007 21:26:12 -0000	1.143
+++ initscripts.spec	13 Aug 2007 19:43:42 -0000	1.144
@@ -3,7 +3,7 @@
 Version: 8.54.1
 License: GPL
 Group: System Environment/Base
-Release: 2
+Release: 3
 Source: initscripts-%{version}.tar.bz2
 Patch0: initscripts-8.54.1-olpc.patch
 BuildRoot: /%{_tmppath}/%{name}-%{version}-%{release}-root
@@ -202,6 +202,9 @@
 /sbin/olpc-dm
 
 %changelog
+* Mon Aug 13 2007 John (J5) Palmieri <johnp at redhat.com> 8.54.1-3
+- fix rwtab to not have resolv.conf which screws up NetworkManager
+
 * Thu Aug 09 2007 John (J5) Palmieri <johnp at redhat.com> 8.54.1-2
 - branch and optimize for olpc
 - add olpc-dm the new display manager for olpc