rpms/initscripts/OLPC-2 initscripts-8.54.1-olpc.patch, 1.3, 1.4 initscripts.spec, 1.146, 1.147
John (J5) Palmieri (johnp)
fedora-extras-commits at redhat.com
Mon Aug 20 20:17:12 UTC 2007
Author: johnp
Update of /cvs/pkgs/rpms/initscripts/OLPC-2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5503
Modified Files:
initscripts-8.54.1-olpc.patch initscripts.spec
Log Message:
- update the olpc patch to include /home/olpc/.Xauthority in rwtab
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.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- initscripts-8.54.1-olpc.patch 13 Aug 2007 19:49:37 -0000 1.3
+++ initscripts-8.54.1-olpc.patch 20 Aug 2007 20:17:09 -0000 1.4
@@ -1,5 +1,6 @@
+diff -up initscripts-8.54.1/rwtab.olpc initscripts-8.54.1/rwtab
--- 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
++++ initscripts-8.54.1/rwtab 2007-08-20 16:15:21.000000000 -0400
@@ -27,7 +27,6 @@ files /etc/adjtime
files /etc/fstab
files /etc/mtab
@@ -8,6 +9,12 @@
files /etc/lvm/.cache
files /etc/lvm/archive
files /etc/lvm/backup
+@@ -38,3 +37,4 @@ files /var/lib/iscsi
+ files /var/lib/logrotate.status
+ files /var/lib/ntp
+ files /var/lib/xen
++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-08-09 18:15:11.000000000 -0400
@@ -15,7 +15,7 @@
@@ -32,6 +39,7 @@
# Run xdm in runlevel 5
-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-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 @@
@@ -216,7 +224,7 @@
+ tty_number = p;
+ }
+
-+
++ printf("TTY: %s\n", tty_name);
+
+ /* find names of Virtual Console devices, for later mode change */
+ snprintf(vcsn, sizeof(vcsn), "/dev/vcs%s", tty_number);
@@ -630,6 +638,7 @@
+
+ return 0;
+}
+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-08-09 18:15:11.000000000 -0400
@@ -1,7 +1,8 @@
Index: initscripts.spec
===================================================================
RCS file: /cvs/pkgs/rpms/initscripts/OLPC-2/initscripts.spec,v
retrieving revision 1.146
retrieving revision 1.147
diff -u -r1.146 -r1.147
--- initscripts.spec 13 Aug 2007 21:48:54 -0000 1.146
+++ initscripts.spec 20 Aug 2007 20:17:09 -0000 1.147
@@ -3,7 +3,7 @@
Version: 8.54.1
License: GPL
Group: System Environment/Base
-Release: 3
+Release: 4
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-4
+- update the olpc patch to include /home/olpc/.Xauthority in rwtab
+
* 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
- don't print out tty in olpc-dm anymore
More information about the fedora-extras-commits
mailing list