From 7fa3f053a9444a1dd24b2f8e968ac4413c12b136 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Mon, 15 Oct 2007 18:53:00 +0000 Subject: [PATCH 01/35] makefile update to properly grab makefile.common --- Makefile | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index f6975f6..3ace173 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,21 @@ # Makefile for source rpm: initscripts -# $Id$ +# $Id: Makefile,v 1.1 2004/09/09 06:14:14 cvsdist Exp $ NAME := initscripts SPECFILE = $(firstword $(wildcard *.spec)) -include ../common/Makefile.common +define find-makefile-common +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done +endef + +MAKEFILE_COMMON := $(shell $(find-makefile-common)) + +ifeq ($(MAKEFILE_COMMON),) +# attempt a checkout +define checkout-makefile-common +test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 +endef + +MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) +endif + +include $(MAKEFILE_COMMON) From 1988dfce525c622a068525e95d4acba5719ad156 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Sat, 19 Jan 2008 03:20:48 +0000 Subject: [PATCH 02/35] 8.61-1 Resolves: bug #429222, bug #251415, bug #334171, bug #426372, bug #428202 Resolves: bug #427767, bug #407531, bug #351291, bug #390271 --- .cvsignore | 2 +- initscripts.spec | 22 +++++++++++++++++++++- sources | 2 +- 3 files changed, 23 insertions(+), 3 deletions(-) diff --git a/.cvsignore b/.cvsignore index 6c4212c..2aac88d 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -initscripts-8.60.tar.bz2 +initscripts-8.61.tar.bz2 diff --git a/initscripts.spec b/initscripts.spec index 80e163d..9e54f70 100644 --- a/initscripts.spec +++ b/initscripts.spec @@ -1,6 +1,6 @@ Summary: The inittab file and the /etc/init.d scripts Name: initscripts -Version: 8.60 +Version: 8.61 # ppp-watch is GPLv2+, everything else is GPLv2 License: GPLv2 and GPLv2+ Group: System Environment/Base @@ -18,6 +18,7 @@ Requires: /etc/redhat-release, dev Requires: ethtool >= 1.8-2, /sbin/runuser Requires: udev >= 115-1 Requires: popt >= 1.12-2 +Requires: cpio, findutils Conflicts: mkinitrd < 4.0, kernel < 2.6.12 Conflicts: ypbind < 1.6-12, psacct < 6.3.2-12, kbd < 1.06-19, lokkit < 0.50-14 Conflicts: dhclient < 3.0.3-7 @@ -208,6 +209,25 @@ rm -rf $RPM_BUILD_ROOT %ghost %attr(0664,root,utmp) /var/run/utmp %changelog +* Fri Jan 18 2008 Bill Nottingham - 8.61-1 +- use lvm, not lvm.static (#429222) +- ifup-eth: don't do something odd if we find a mac address that + matches the user-set MACADDR (#251415) +- rc.sysinit: fix root fs check to catch 'rw,ordered,noatime,etc.' properly + (#334171) +- rc.sysinit: Use proper invocations for authconfig, system-config-network + (#426372, #428202) +- service: handle unreadable scripts (#427767) +- initscripts.spec: add requirements for stateless +- fix perms on /etc/profile.d (#407531, ) +- rename_device: handle quoted HWADDR, etc. in ifcfg scripts (#351291) +- minor stateless fixes +- Makefile cleanups (from OLPC, ) +- translation updates: fr, ru, nb +- don't endelessly loop on ifdown (#390271) +- rc.sysinit: - fix encrypted swap partitions with random key + () + * Tue Oct 9 2007 Bill Nottingham - 8.60-1 - don't chvt with rhgb - just kill it when needed diff --git a/sources b/sources index b8ec5f5..498c2ee 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -a0e888cc91ef6350a991985567d21366 initscripts-8.60.tar.bz2 +cc0bd193d7d50574990e298d88f0f410 initscripts-8.61.tar.bz2 From 66e5739b57a4d5258e28bdd4979f0f285906c5df Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Mon, 21 Jan 2008 22:12:46 +0000 Subject: [PATCH 03/35] 8.62-1 Resolves: bug #429556 --- .cvsignore | 2 +- initscripts.spec | 6 +++++- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.cvsignore b/.cvsignore index 2aac88d..86a220f 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -initscripts-8.61.tar.bz2 +initscripts-8.62.tar.bz2 diff --git a/initscripts.spec b/initscripts.spec index 9e54f70..410fa6e 100644 --- a/initscripts.spec +++ b/initscripts.spec @@ -1,6 +1,6 @@ Summary: The inittab file and the /etc/init.d scripts Name: initscripts -Version: 8.61 +Version: 8.62 # ppp-watch is GPLv2+, everything else is GPLv2 License: GPLv2 and GPLv2+ Group: System Environment/Base @@ -209,6 +209,10 @@ rm -rf $RPM_BUILD_ROOT %ghost %attr(0664,root,utmp) /var/run/utmp %changelog +* Mon Jan 21 2008 Bill Nottingham - 8.62-1 +- rc.d/rc.sysinit: fix syntax error (#429556) +- migrate sr@Latn -> sr@latin () + * Fri Jan 18 2008 Bill Nottingham - 8.61-1 - use lvm, not lvm.static (#429222) - ifup-eth: don't do something odd if we find a mac address that diff --git a/sources b/sources index 498c2ee..2f4b030 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -cc0bd193d7d50574990e298d88f0f410 initscripts-8.61.tar.bz2 +c48b16ff7ccfa07051d1bdc3c66101f2 initscripts-8.62.tar.bz2 From 99ca3929f9546c4ddf30c77e0b228ccd932637f3 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Mon, 4 Feb 2008 05:49:08 +0000 Subject: [PATCH 04/35] 8.63-1 --- .cvsignore | 2 +- initscripts.spec | 12 ++++++++++-- sources | 2 +- 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/.cvsignore b/.cvsignore index 86a220f..d417901 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -initscripts-8.62.tar.bz2 +initscripts-8.63.tar.bz2 diff --git a/initscripts.spec b/initscripts.spec index 410fa6e..4b8b54d 100644 --- a/initscripts.spec +++ b/initscripts.spec @@ -1,6 +1,6 @@ Summary: The inittab file and the /etc/init.d scripts Name: initscripts -Version: 8.62 +Version: 8.63 # ppp-watch is GPLv2+, everything else is GPLv2 License: GPLv2 and GPLv2+ Group: System Environment/Base @@ -19,7 +19,7 @@ Requires: ethtool >= 1.8-2, /sbin/runuser Requires: udev >= 115-1 Requires: popt >= 1.12-2 Requires: cpio, findutils -Conflicts: mkinitrd < 4.0, kernel < 2.6.12 +Conflicts: mkinitrd < 4.0, kernel < 2.6.12, mdadm < 2.6.4-3 Conflicts: ypbind < 1.6-12, psacct < 6.3.2-12, kbd < 1.06-19, lokkit < 0.50-14 Conflicts: dhclient < 3.0.3-7 Conflicts: tcsh < 6.13-5 @@ -202,6 +202,9 @@ rm -rf $RPM_BUILD_ROOT %config /etc/ppp/ipv6-up %config /etc/ppp/ipv6-down %config /etc/initlog.conf +%dir /etc/NetworkManager +%dir /etc/NetworkManager/dispatcher.d +/etc/NetworkManager/dispatcher.d/00-netreport %doc sysconfig.txt sysvinitfiles ChangeLog static-routes-ipv6 ipv6-tunnel.howto ipv6-6to4.howto changes.ipv6 COPYING /var/lib/stateless %ghost %attr(0600,root,utmp) /var/log/btmp @@ -209,6 +212,11 @@ rm -rf $RPM_BUILD_ROOT %ghost %attr(0664,root,utmp) /var/run/utmp %changelog +* Fri Feb 1 2008 Bill Nottingham - 8.63-1 +- don't start RAID arrays in rc.sysinit, that's done by udev (corollary of #429604) +- add a NetworkManager-dispatcher script that does netreport on interface changes +- use udev rules to set the clock, avoiding issues with modular rtcs (#290731) + * Mon Jan 21 2008 Bill Nottingham - 8.62-1 - rc.d/rc.sysinit: fix syntax error (#429556) - migrate sr@Latn -> sr@latin () diff --git a/sources b/sources index 2f4b030..6423af0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -c48b16ff7ccfa07051d1bdc3c66101f2 initscripts-8.62.tar.bz2 +0a3abaaee79783375b4148f756acdb2b initscripts-8.63.tar.bz2 From c125186b5c803d491c5950c79489b79d99c2a3fd Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Tue, 26 Feb 2008 04:28:52 +0000 Subject: [PATCH 05/35] add /sbin/pidof requirement to make upstart upgrades more clean (#434863) --- initscripts.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/initscripts.spec b/initscripts.spec index 4b8b54d..5858665 100644 --- a/initscripts.spec +++ b/initscripts.spec @@ -4,12 +4,13 @@ Version: 8.63 # ppp-watch is GPLv2+, everything else is GPLv2 License: GPLv2 and GPLv2+ Group: System Environment/Base -Release: 1 +Release: 2 Source: initscripts-%{version}.tar.bz2 BuildRoot: /%{_tmppath}/%{name}-%{version}-%{release}-root Requires: mingetty, /bin/awk, /bin/sed, mktemp, e2fsprogs >= 1.15 Requires: /sbin/sysctl, syslog Requires: /sbin/fuser, /bin/grep +Requires: /sbin/pidof Requires: module-init-tools Requires: util-linux >= 2.10s-11, mount >= 2.11l Requires: bash >= 3.0, SysVinit >= 2.85-38 @@ -212,6 +213,9 @@ rm -rf $RPM_BUILD_ROOT %ghost %attr(0664,root,utmp) /var/run/utmp %changelog +* Mon Feb 25 2008 Bill Nottingham +- add /sbin/pidof requirement (#434863) + * Fri Feb 1 2008 Bill Nottingham - 8.63-1 - don't start RAID arrays in rc.sysinit, that's done by udev (corollary of #429604) - add a NetworkManager-dispatcher script that does netreport on interface changes From b498eead3690d9782212fddfe1d9d8f346a9185d Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Tue, 26 Feb 2008 06:54:07 +0000 Subject: [PATCH 06/35] Update to 8.64 --- .cvsignore | 2 +- initscripts.spec | 8 +++++--- sources | 2 +- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/.cvsignore b/.cvsignore index d417901..538dae6 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -initscripts-8.63.tar.bz2 +initscripts-8.64.tar.bz2 diff --git a/initscripts.spec b/initscripts.spec index 5858665..d2b70a8 100644 --- a/initscripts.spec +++ b/initscripts.spec @@ -1,10 +1,10 @@ Summary: The inittab file and the /etc/init.d scripts Name: initscripts -Version: 8.63 +Version: 8.64 # ppp-watch is GPLv2+, everything else is GPLv2 License: GPLv2 and GPLv2+ Group: System Environment/Base -Release: 2 +Release: 1 Source: initscripts-%{version}.tar.bz2 BuildRoot: /%{_tmppath}/%{name}-%{version}-%{release}-root Requires: mingetty, /bin/awk, /bin/sed, mktemp, e2fsprogs >= 1.15 @@ -187,6 +187,7 @@ rm -rf $RPM_BUILD_ROOT %attr(2755,root,root) /sbin/netreport /sbin/initlog /lib/udev/rename_device +/lib/udev/console_init %ifarch s390 s390x /lib/udev/ccw_init %endif @@ -213,7 +214,8 @@ rm -rf $RPM_BUILD_ROOT %ghost %attr(0664,root,utmp) /var/run/utmp %changelog -* Mon Feb 25 2008 Bill Nottingham +* Tue Feb 26 2008 Bill Nottingham - 8.64-1 +- Add a console_init udev helper to do console initialization - add /sbin/pidof requirement (#434863) * Fri Feb 1 2008 Bill Nottingham - 8.63-1 diff --git a/sources b/sources index 6423af0..78f1f6f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -0a3abaaee79783375b4148f756acdb2b initscripts-8.63.tar.bz2 +0cd8e1fd5597f3a1427aa3da50eb0570 initscripts-8.64.tar.bz2 From 72a9ef1cc3271cb3598ac7d5d0cbd0a001554894 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Tue, 11 Mar 2008 03:37:35 +0000 Subject: [PATCH 07/35] 8.65-1 --- .cvsignore | 2 +- initscripts.spec | 12 +++++++++++- sources | 2 +- 3 files changed, 13 insertions(+), 3 deletions(-) diff --git a/.cvsignore b/.cvsignore index 538dae6..e5d6034 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -initscripts-8.64.tar.bz2 +initscripts-8.65.tar.bz2 diff --git a/initscripts.spec b/initscripts.spec index d2b70a8..e3496c9 100644 --- a/initscripts.spec +++ b/initscripts.spec @@ -1,6 +1,6 @@ Summary: The inittab file and the /etc/init.d scripts Name: initscripts -Version: 8.64 +Version: 8.65 # ppp-watch is GPLv2+, everything else is GPLv2 License: GPLv2 and GPLv2+ Group: System Environment/Base @@ -156,6 +156,7 @@ rm -rf $RPM_BUILD_ROOT %dir /etc/rwtab.d /etc/statetab %dir /etc/statetab.d +%config(noreplace) /etc/event.d/* /etc/udev/rules.d/* %config /etc/X11/prefdm %config(noreplace) /etc/inittab @@ -188,6 +189,7 @@ rm -rf $RPM_BUILD_ROOT /sbin/initlog /lib/udev/rename_device /lib/udev/console_init +/lib/udev/console_check %ifarch s390 s390x /lib/udev/ccw_init %endif @@ -214,6 +216,14 @@ rm -rf $RPM_BUILD_ROOT %ghost %attr(0664,root,utmp) /var/run/utmp %changelog +* Mon Mar 10 2008 Bill Nottingham - 8.65-1 +- Add a serial console udev/upstart handler (#434764, indirectly) +- Add some upstart notification for sysv scripts (modified from , #431231) +- Handle _rnetdev correctly (#435358, ) +- various minor speedups () +- translation updates: el, fr +- disable network by default, in favor of NetworkManager + * Tue Feb 26 2008 Bill Nottingham - 8.64-1 - Add a console_init udev helper to do console initialization - add /sbin/pidof requirement (#434863) diff --git a/sources b/sources index 78f1f6f..0f8f7fc 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -0cd8e1fd5597f3a1427aa3da50eb0570 initscripts-8.64.tar.bz2 +407af0ad2f8d837b4b15bf6685624b15 initscripts-8.65.tar.bz2 From 14add6d4126858b53a82fc1d7783cc49ced5603a Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Tue, 11 Mar 2008 19:29:49 +0000 Subject: [PATCH 08/35] 8.66-1 --- .cvsignore | 2 +- initscripts.spec | 6 +++++- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.cvsignore b/.cvsignore index e5d6034..8820394 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -initscripts-8.65.tar.bz2 +initscripts-8.66.tar.bz2 diff --git a/initscripts.spec b/initscripts.spec index e3496c9..9f3a527 100644 --- a/initscripts.spec +++ b/initscripts.spec @@ -1,6 +1,6 @@ Summary: The inittab file and the /etc/init.d scripts Name: initscripts -Version: 8.65 +Version: 8.66 # ppp-watch is GPLv2+, everything else is GPLv2 License: GPLv2 and GPLv2+ Group: System Environment/Base @@ -28,6 +28,7 @@ Conflicts: xorg-x11, glib2 < 2.11.1-2 Conflicts: alsa-utils < 1.0.14-0.5.rc2.fc7 # http://bugzilla.redhat.com/show_bug.cgi?id=252973 Conflicts: nut < 2.2.0 +Conflicts: rhgb < 0.17.7-7 Obsoletes: rhsound sapinit Obsoletes: hotplug Prereq: /sbin/chkconfig, /usr/sbin/groupadd, /bin/sed, coreutils @@ -216,6 +217,9 @@ rm -rf $RPM_BUILD_ROOT %ghost %attr(0664,root,utmp) /var/run/utmp %changelog +* Tue Mar 11 2008 Bill Nottingham - 8.66-1 +- use upstart to start rhgb (#433156, ) + * Mon Mar 10 2008 Bill Nottingham - 8.65-1 - Add a serial console udev/upstart handler (#434764, indirectly) - Add some upstart notification for sysv scripts (modified from , #431231) diff --git a/sources b/sources index 0f8f7fc..42fdbfa 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -407af0ad2f8d837b4b15bf6685624b15 initscripts-8.65.tar.bz2 +f34d2229b3e3b01bfbb8ad77a8292691 initscripts-8.66.tar.bz2 From 3110d433ed96c60383202f7cee4b1d1ac9344c0e Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Tue, 11 Mar 2008 21:49:40 +0000 Subject: [PATCH 09/35] 8.67-1 --- .cvsignore | 2 +- initscripts.spec | 6 ++++-- sources | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/.cvsignore b/.cvsignore index 8820394..eff72f1 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -initscripts-8.66.tar.bz2 +initscripts-8.67.tar.bz2 diff --git a/initscripts.spec b/initscripts.spec index 9f3a527..08de49a 100644 --- a/initscripts.spec +++ b/initscripts.spec @@ -1,6 +1,6 @@ Summary: The inittab file and the /etc/init.d scripts Name: initscripts -Version: 8.66 +Version: 8.67 # ppp-watch is GPLv2+, everything else is GPLv2 License: GPLv2 and GPLv2+ Group: System Environment/Base @@ -28,7 +28,6 @@ Conflicts: xorg-x11, glib2 < 2.11.1-2 Conflicts: alsa-utils < 1.0.14-0.5.rc2.fc7 # http://bugzilla.redhat.com/show_bug.cgi?id=252973 Conflicts: nut < 2.2.0 -Conflicts: rhgb < 0.17.7-7 Obsoletes: rhsound sapinit Obsoletes: hotplug Prereq: /sbin/chkconfig, /usr/sbin/groupadd, /bin/sed, coreutils @@ -217,6 +216,9 @@ rm -rf $RPM_BUILD_ROOT %ghost %attr(0664,root,utmp) /var/run/utmp %changelog +* Tue Mar 11 2008 Bill Nottingham - 8.67-1 +- actually, don't + * Tue Mar 11 2008 Bill Nottingham - 8.66-1 - use upstart to start rhgb (#433156, ) diff --git a/sources b/sources index 42fdbfa..732282c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -f34d2229b3e3b01bfbb8ad77a8292691 initscripts-8.66.tar.bz2 +dec2a843e785d3712436b3abfc490b7a initscripts-8.67.tar.bz2 From 9e956d8fdda2a6b3584228d086e7938dff999dab Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Tue, 25 Mar 2008 14:51:53 +0000 Subject: [PATCH 10/35] apply patch fro sparc console --- initscripts-8.67-sparc-console.patch | 26 ++++++++++++++++++++++++++ initscripts.spec | 8 +++++++- 2 files changed, 33 insertions(+), 1 deletion(-) create mode 100644 initscripts-8.67-sparc-console.patch diff --git a/initscripts-8.67-sparc-console.patch b/initscripts-8.67-sparc-console.patch new file mode 100644 index 0000000..4b0d66d --- /dev/null +++ b/initscripts-8.67-sparc-console.patch @@ -0,0 +1,26 @@ +--- initscripts-8.67/src/console_check.c.BAD 2008-03-25 09:26:45.000000000 -0500 ++++ initscripts-8.67/src/console_check.c 2008-03-25 09:29:08.000000000 -0500 +@@ -48,6 +48,15 @@ + {0, 0} + }; + ++#if defined(__sparc__) ++static int termcmp(struct termios *a, struct termios *b) ++{ ++ if (a->c_iflag != b->c_iflag || a->c_oflag != b->c_oflag || ++ a->c_cflag != b->c_cflag || a->c_lflag != b->c_lflag) ++ return 1; ++ return memcmp(a->c_cc, b->c_cc, sizeof(a->c_cc)); ++} ++#else + int termcmp(struct termios *a, struct termios *b) { + if (a->c_iflag != b->c_iflag || a->c_oflag != b->c_oflag || + a->c_cflag != b->c_cflag || a->c_lflag != b->c_lflag || +@@ -55,6 +64,7 @@ + return 1; + return memcmp(a->c_cc, b->c_cc, sizeof(a->c_cc)); + } ++#endif + + int get_serial_speed(int fd) { + struct termios mode; diff --git a/initscripts.spec b/initscripts.spec index 08de49a..ec58011 100644 --- a/initscripts.spec +++ b/initscripts.spec @@ -4,8 +4,10 @@ Version: 8.67 # ppp-watch is GPLv2+, everything else is GPLv2 License: GPLv2 and GPLv2+ Group: System Environment/Base -Release: 1 +Release: 2 Source: initscripts-%{version}.tar.bz2 +Patch0: initscripts-8.67-sparc-console.patch + BuildRoot: /%{_tmppath}/%{name}-%{version}-%{release}-root Requires: mingetty, /bin/awk, /bin/sed, mktemp, e2fsprogs >= 1.15 Requires: /sbin/sysctl, syslog @@ -41,6 +43,7 @@ deactivate most network interfaces. %prep %setup -q +%patch0 -p1 %build make @@ -216,6 +219,9 @@ rm -rf $RPM_BUILD_ROOT %ghost %attr(0664,root,utmp) /var/run/utmp %changelog +* Tue Mar 25 2008 Dennis Gilmore - 8.67-2 +- apply patch for sparc console + * Tue Mar 11 2008 Bill Nottingham - 8.67-1 - actually, don't From a362a247151c1df12c4af1de3968e0dd2b45f277 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Fri, 4 Apr 2008 15:41:49 +0000 Subject: [PATCH 11/35] 8.68-1 --- .cvsignore | 2 +- initscripts.spec | 44 ++++++++++++++++++++++++++++++++++++-------- sources | 2 +- 3 files changed, 38 insertions(+), 10 deletions(-) diff --git a/.cvsignore b/.cvsignore index eff72f1..636def9 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -initscripts-8.67.tar.bz2 +initscripts-8.68.tar.bz2 diff --git a/initscripts.spec b/initscripts.spec index ec58011..6ada841 100644 --- a/initscripts.spec +++ b/initscripts.spec @@ -1,13 +1,13 @@ +%define with_upstart 1%{nil} + Summary: The inittab file and the /etc/init.d scripts Name: initscripts -Version: 8.67 +Version: 8.68 # ppp-watch is GPLv2+, everything else is GPLv2 License: GPLv2 and GPLv2+ Group: System Environment/Base -Release: 2 +Release: 1 Source: initscripts-%{version}.tar.bz2 -Patch0: initscripts-8.67-sparc-console.patch - BuildRoot: /%{_tmppath}/%{name}-%{version}-%{release}-root Requires: mingetty, /bin/awk, /bin/sed, mktemp, e2fsprogs >= 1.15 Requires: /sbin/sysctl, syslog @@ -15,7 +15,12 @@ Requires: /sbin/fuser, /bin/grep Requires: /sbin/pidof Requires: module-init-tools Requires: util-linux >= 2.10s-11, mount >= 2.11l -Requires: bash >= 3.0, SysVinit >= 2.85-38 +Requires: bash >= 3.0 +%if with_upstart +Requires: upstart +%else +Requires: SysVinit >= 2.85-38 +%endif Requires: /sbin/ip, /sbin/arping, net-tools Requires: /etc/redhat-release, dev Requires: ethtool >= 1.8-2, /sbin/runuser @@ -43,7 +48,6 @@ deactivate most network interfaces. %prep %setup -q -%patch0 -p1 %build make @@ -54,6 +58,13 @@ make ROOT=$RPM_BUILD_ROOT SUPERUSER=`id -un` SUPERGROUP=`id -gn` mandir=%{_mandi %find_lang %{name} +%if with_upstart + mv -f $RPM_BUILD_ROOT/etc/inittab.upstart $RPM_BUILD_ROOT/etc/inittab +%else + mv -f $RPM_BUILD_ROOT/etc/inittab.sysv $RPM_BUILD_ROOT/etc/inittab +%endif +rm -f $RPM_BUILD_ROOT/etc/inittab.* + %ifnarch s390 s390x rm -f \ $RPM_BUILD_ROOT/etc/sysconfig/network-scripts/ifup-ctc \ @@ -188,6 +199,7 @@ rm -rf $RPM_BUILD_ROOT /sbin/fstab-decode /sbin/genhostid /sbin/getkey +/sbin/securetty %attr(2755,root,root) /sbin/netreport /sbin/initlog /lib/udev/rename_device @@ -212,6 +224,7 @@ rm -rf $RPM_BUILD_ROOT %dir /etc/NetworkManager %dir /etc/NetworkManager/dispatcher.d /etc/NetworkManager/dispatcher.d/00-netreport +/etc/NetworkManager/dispatcher.d/05-netfs %doc sysconfig.txt sysvinitfiles ChangeLog static-routes-ipv6 ipv6-tunnel.howto ipv6-6to4.howto changes.ipv6 COPYING /var/lib/stateless %ghost %attr(0600,root,utmp) /var/log/btmp @@ -219,8 +232,23 @@ rm -rf $RPM_BUILD_ROOT %ghost %attr(0664,root,utmp) /var/run/utmp %changelog -* Tue Mar 25 2008 Dennis Gilmore - 8.67-2 -- apply patch for sparc console +* Fri Apr 4 2008 Bill Nottingham - 8.68-1 +- netfs: umount 'ncp' filesystems as well (#437117) +- improve performance of s390 ccw rules (#437110, ) +- fix consoletype environment leak (#439546) +- ifdown-eth: make sure NEWCONFIG exists before grepping for it (#390271, continued) +- console_check: always open with NONBLOCK, clear the serial structs first, + handle non-16550 ports () +- halt: don't use /etc/sysconfig/clock (#438337) +- ifup: don't attempt to re-enslave already-enslaved devices (#440077) +- netfs: run as a NetworkManagerDispatcher script (#439242) +- netfs: remove $local_fs from the list of provides (making it implicitly provided + by booting) +- serial: add a crude hack to wait for runlevels to finish (#437379) +- serial: frob /etc/securetty when necessary (#437381) +- add a upstart-specific inittab +- translation updates: as, bn_IN, cs, de, es, fi, fr, gu, hi, it, ja, kn, ml, mr, nb, + nl, pa, pl, pt_BR, ru, sk, sr, ta, te, zh_CN * Tue Mar 11 2008 Bill Nottingham - 8.67-1 - actually, don't diff --git a/sources b/sources index 732282c..0abcd2a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -dec2a843e785d3712436b3abfc490b7a initscripts-8.67.tar.bz2 +83f95e19fffe55b2d17d4f967a08200d initscripts-8.68.tar.bz2 From f709eec77982c35bbf5fa8ff19da60fbe79d40ef Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Fri, 4 Apr 2008 15:43:13 +0000 Subject: [PATCH 12/35] remove merged patch --- initscripts-8.67-sparc-console.patch | 26 -------------------------- 1 file changed, 26 deletions(-) delete mode 100644 initscripts-8.67-sparc-console.patch diff --git a/initscripts-8.67-sparc-console.patch b/initscripts-8.67-sparc-console.patch deleted file mode 100644 index 4b0d66d..0000000 --- a/initscripts-8.67-sparc-console.patch +++ /dev/null @@ -1,26 +0,0 @@ ---- initscripts-8.67/src/console_check.c.BAD 2008-03-25 09:26:45.000000000 -0500 -+++ initscripts-8.67/src/console_check.c 2008-03-25 09:29:08.000000000 -0500 -@@ -48,6 +48,15 @@ - {0, 0} - }; - -+#if defined(__sparc__) -+static int termcmp(struct termios *a, struct termios *b) -+{ -+ if (a->c_iflag != b->c_iflag || a->c_oflag != b->c_oflag || -+ a->c_cflag != b->c_cflag || a->c_lflag != b->c_lflag) -+ return 1; -+ return memcmp(a->c_cc, b->c_cc, sizeof(a->c_cc)); -+} -+#else - int termcmp(struct termios *a, struct termios *b) { - if (a->c_iflag != b->c_iflag || a->c_oflag != b->c_oflag || - a->c_cflag != b->c_cflag || a->c_lflag != b->c_lflag || -@@ -55,6 +64,7 @@ - return 1; - return memcmp(a->c_cc, b->c_cc, sizeof(a->c_cc)); - } -+#endif - - int get_serial_speed(int fd) { - struct termios mode; From 0d299e4c4f82126ebae75852ec8433babcdf56f2 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Tue, 8 Apr 2008 05:20:32 +0000 Subject: [PATCH 13/35] 8.69-1 --- .cvsignore | 2 +- initscripts.spec | 7 ++++++- sources | 2 +- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/.cvsignore b/.cvsignore index 636def9..4c2ff84 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -initscripts-8.68.tar.bz2 +initscripts-8.69.tar.bz2 diff --git a/initscripts.spec b/initscripts.spec index 6ada841..26c0015 100644 --- a/initscripts.spec +++ b/initscripts.spec @@ -2,7 +2,7 @@ Summary: The inittab file and the /etc/init.d scripts Name: initscripts -Version: 8.68 +Version: 8.69 # ppp-watch is GPLv2+, everything else is GPLv2 License: GPLv2 and GPLv2+ Group: System Environment/Base @@ -232,6 +232,11 @@ rm -rf $RPM_BUILD_ROOT %ghost %attr(0664,root,utmp) /var/run/utmp %changelog +* Tue Apr 8 2008 Bill Nottingham - 8.69-1 +- Bring up lo whenever it shows up, not just in network/NM +- fix shutdown-related oddities (#438444) +- translation updates: el, sr, sr@latin, sv + * Fri Apr 4 2008 Bill Nottingham - 8.68-1 - netfs: umount 'ncp' filesystems as well (#437117) - improve performance of s390 ccw rules (#437110, ) diff --git a/sources b/sources index 0abcd2a..79e72d8 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -83f95e19fffe55b2d17d4f967a08200d initscripts-8.68.tar.bz2 +27cbae056e0980a9355555639114f047 initscripts-8.69.tar.bz2 From 42c4b6031da6d7609d76b9b0ecfd96402be700cd Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Tue, 15 Apr 2008 17:07:19 +0000 Subject: [PATCH 14/35] 8.70-1 --- .cvsignore | 2 +- initscripts.spec | 14 +++++++++++--- sources | 2 +- 3 files changed, 13 insertions(+), 5 deletions(-) diff --git a/.cvsignore b/.cvsignore index 4c2ff84..87e2893 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -initscripts-8.69.tar.bz2 +initscripts-8.70.tar.bz2 diff --git a/initscripts.spec b/initscripts.spec index 26c0015..0194ccf 100644 --- a/initscripts.spec +++ b/initscripts.spec @@ -2,7 +2,7 @@ Summary: The inittab file and the /etc/init.d scripts Name: initscripts -Version: 8.69 +Version: 8.70 # ppp-watch is GPLv2+, everything else is GPLv2 License: GPLv2 and GPLv2+ Group: System Environment/Base @@ -17,11 +17,11 @@ Requires: module-init-tools Requires: util-linux >= 2.10s-11, mount >= 2.11l Requires: bash >= 3.0 %if with_upstart -Requires: upstart +Requires: upstart, event-compat-sysv %else Requires: SysVinit >= 2.85-38 %endif -Requires: /sbin/ip, /sbin/arping, net-tools +Requires: /sbin/ip, /sbin/arping, net-tools, /bin/find Requires: /etc/redhat-release, dev Requires: ethtool >= 1.8-2, /sbin/runuser Requires: udev >= 115-1 @@ -232,6 +232,14 @@ rm -rf $RPM_BUILD_ROOT %ghost %attr(0664,root,utmp) /var/run/utmp %changelog +* Tue Apr 15 2008 Bill Nottingham - 8.70-1 +- find is now in /bin. Use it. (#192991, #239914, #244941, #442178) +- require event-compat-sysv for now (#442291) +- fix serial event to wait properly +- handle encrypted LVs properly (#441728) +- add a sit tunnel type (#441635) +- translation updates: ru + * Tue Apr 8 2008 Bill Nottingham - 8.69-1 - Bring up lo whenever it shows up, not just in network/NM - fix shutdown-related oddities (#438444) diff --git a/sources b/sources index 79e72d8..22b0852 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -27cbae056e0980a9355555639114f047 initscripts-8.69.tar.bz2 +c4fee3cc2d12b71f737a5e01a424d5e6 initscripts-8.70.tar.bz2 From 02b68ed1c28a8990e31009508f24d42da4b67cab Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Tue, 15 Apr 2008 17:17:29 +0000 Subject: [PATCH 15/35] fix minor bug --- sources | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sources b/sources index 22b0852..bba58cb 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -c4fee3cc2d12b71f737a5e01a424d5e6 initscripts-8.70.tar.bz2 +e3cd9677b7e1103c0217f2455b9400a2 initscripts-8.70.tar.bz2 From 253eb1502d201b099a60afd6698aaf9b158540ce Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Wed, 23 Apr 2008 19:36:56 +0000 Subject: [PATCH 16/35] 8.71-1 --- .cvsignore | 2 +- initscripts.spec | 7 ++++++- sources | 2 +- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/.cvsignore b/.cvsignore index 87e2893..4ab2c53 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -initscripts-8.70.tar.bz2 +initscripts-8.71.tar.bz2 diff --git a/initscripts.spec b/initscripts.spec index 0194ccf..70a04c5 100644 --- a/initscripts.spec +++ b/initscripts.spec @@ -2,7 +2,7 @@ Summary: The inittab file and the /etc/init.d scripts Name: initscripts -Version: 8.70 +Version: 8.71 # ppp-watch is GPLv2+, everything else is GPLv2 License: GPLv2 and GPLv2+ Group: System Environment/Base @@ -232,6 +232,11 @@ rm -rf $RPM_BUILD_ROOT %ghost %attr(0664,root,utmp) /var/run/utmp %changelog +* Wed Apr 23 2008 Bill Nottingham - 8.71-1 +- adjust to gdm using LANG instead of GDM_LANG (#372151, ) +- rework netfs' check for networking availability to properly handle both network + and NetworkManager + * Tue Apr 15 2008 Bill Nottingham - 8.70-1 - find is now in /bin. Use it. (#192991, #239914, #244941, #442178) - require event-compat-sysv for now (#442291) diff --git a/sources b/sources index bba58cb..28e1b4d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -e3cd9677b7e1103c0217f2455b9400a2 initscripts-8.70.tar.bz2 +4d93f6d611791b23ff857e6aa7289ff6 initscripts-8.71.tar.bz2 From d4303c4dfa4b3f081cd9d87d1cdac666b1c04370 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 24 Apr 2008 19:56:54 +0000 Subject: [PATCH 17/35] 8.72-1 --- .cvsignore | 2 +- initscripts.spec | 9 +++++++-- sources | 2 +- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/.cvsignore b/.cvsignore index 4ab2c53..65549a7 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -initscripts-8.71.tar.bz2 +initscripts-8.72.tar.bz2 diff --git a/initscripts.spec b/initscripts.spec index 70a04c5..61d47e0 100644 --- a/initscripts.spec +++ b/initscripts.spec @@ -2,7 +2,7 @@ Summary: The inittab file and the /etc/init.d scripts Name: initscripts -Version: 8.71 +Version: 8.72 # ppp-watch is GPLv2+, everything else is GPLv2 License: GPLv2 and GPLv2+ Group: System Environment/Base @@ -17,7 +17,7 @@ Requires: module-init-tools Requires: util-linux >= 2.10s-11, mount >= 2.11l Requires: bash >= 3.0 %if with_upstart -Requires: upstart, event-compat-sysv +Requires: upstart, event-compat-sysv >= 0.3.9-14 %else Requires: SysVinit >= 2.85-38 %endif @@ -60,6 +60,8 @@ make ROOT=$RPM_BUILD_ROOT SUPERUSER=`id -un` SUPERGROUP=`id -gn` mandir=%{_mandi %if with_upstart mv -f $RPM_BUILD_ROOT/etc/inittab.upstart $RPM_BUILD_ROOT/etc/inittab + rm -f $RPM_BUILD_ROOT/etc/rc.d/rc1.d/S99single + rm -f $RPM_BUILD_ROOT/etc/rc.d/init.d/single %else mv -f $RPM_BUILD_ROOT/etc/inittab.sysv $RPM_BUILD_ROOT/etc/inittab %endif @@ -232,6 +234,9 @@ rm -rf $RPM_BUILD_ROOT %ghost %attr(0664,root,utmp) /var/run/utmp %changelog +* Thu Apr 24 2008 Bill Nottingham - 8.72-1 +- don't have a S99single when using upstart (#444001, indirectly) + * Wed Apr 23 2008 Bill Nottingham - 8.71-1 - adjust to gdm using LANG instead of GDM_LANG (#372151, ) - rework netfs' check for networking availability to properly handle both network diff --git a/sources b/sources index 28e1b4d..4f10d1d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -4d93f6d611791b23ff857e6aa7289ff6 initscripts-8.71.tar.bz2 +edeaa62a30870f3f9dd3c6800c0ca0fd initscripts-8.72.tar.bz2 From 650e2b69c1c07fd2dfcfa31e2c72baa426ff70a9 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Fri, 25 Apr 2008 21:25:18 +0000 Subject: [PATCH 18/35] 8.73-1 --- .cvsignore | 2 +- initscripts.spec | 15 ++++++++++++--- sources | 2 +- 3 files changed, 14 insertions(+), 5 deletions(-) diff --git a/.cvsignore b/.cvsignore index 65549a7..44d24b2 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -initscripts-8.72.tar.bz2 +initscripts-8.73.tar.bz2 diff --git a/initscripts.spec b/initscripts.spec index 61d47e0..5f2f5b0 100644 --- a/initscripts.spec +++ b/initscripts.spec @@ -2,7 +2,7 @@ Summary: The inittab file and the /etc/init.d scripts Name: initscripts -Version: 8.72 +Version: 8.73 # ppp-watch is GPLv2+, everything else is GPLv2 License: GPLv2 and GPLv2+ Group: System Environment/Base @@ -17,7 +17,8 @@ Requires: module-init-tools Requires: util-linux >= 2.10s-11, mount >= 2.11l Requires: bash >= 3.0 %if with_upstart -Requires: upstart, event-compat-sysv >= 0.3.9-14 +Requires: upstart +Obsoletes: event-compat-sysv %else Requires: SysVinit >= 2.85-38 %endif @@ -64,6 +65,7 @@ make ROOT=$RPM_BUILD_ROOT SUPERUSER=`id -un` SUPERGROUP=`id -gn` mandir=%{_mandi rm -f $RPM_BUILD_ROOT/etc/rc.d/init.d/single %else mv -f $RPM_BUILD_ROOT/etc/inittab.sysv $RPM_BUILD_ROOT/etc/inittab + rm -rf $RPM_BUILD_ROOT/etc/event.d %endif rm -f $RPM_BUILD_ROOT/etc/inittab.* @@ -172,7 +174,9 @@ rm -rf $RPM_BUILD_ROOT %dir /etc/rwtab.d /etc/statetab %dir /etc/statetab.d +%if with_upstart %config(noreplace) /etc/event.d/* +%endif /etc/udev/rules.d/* %config /etc/X11/prefdm %config(noreplace) /etc/inittab @@ -227,13 +231,18 @@ rm -rf $RPM_BUILD_ROOT %dir /etc/NetworkManager/dispatcher.d /etc/NetworkManager/dispatcher.d/00-netreport /etc/NetworkManager/dispatcher.d/05-netfs -%doc sysconfig.txt sysvinitfiles ChangeLog static-routes-ipv6 ipv6-tunnel.howto ipv6-6to4.howto changes.ipv6 COPYING +%doc sysconfig.txt sysvinitfiles ChangeLog static-routes-ipv6 ipv6-tunnel.howto ipv6-6to4.howto changes.ipv6 COPYING README-event.d /var/lib/stateless %ghost %attr(0600,root,utmp) /var/log/btmp %ghost %attr(0664,root,utmp) /var/log/wtmp %ghost %attr(0664,root,utmp) /var/run/utmp %changelog +* Fri Apr 25 2008 Bill Nottingham - 8.73-1 +- move event-compat-sysv events here, obsolete it +- fix ctrl-alt-del during rc.sysinit (#444050) +- fix 'telinit X' from single-user mode (#444001) + * Thu Apr 24 2008 Bill Nottingham - 8.72-1 - don't have a S99single when using upstart (#444001, indirectly) diff --git a/sources b/sources index 4f10d1d..7933647 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -edeaa62a30870f3f9dd3c6800c0ca0fd initscripts-8.72.tar.bz2 +0fd1866b3fb2cb26b42033e7bc0cf7c0 initscripts-8.73.tar.bz2 From 8126e99e0c7336fe718cd7285142be991dc2f996 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Tue, 29 Apr 2008 15:55:38 +0000 Subject: [PATCH 19/35] 8.74-1 --- .cvsignore | 2 +- initscripts.spec | 6 +++++- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.cvsignore b/.cvsignore index 44d24b2..4acac76 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -initscripts-8.73.tar.bz2 +initscripts-8.74.tar.bz2 diff --git a/initscripts.spec b/initscripts.spec index 5f2f5b0..1e594e9 100644 --- a/initscripts.spec +++ b/initscripts.spec @@ -2,7 +2,7 @@ Summary: The inittab file and the /etc/init.d scripts Name: initscripts -Version: 8.73 +Version: 8.74 # ppp-watch is GPLv2+, everything else is GPLv2 License: GPLv2 and GPLv2+ Group: System Environment/Base @@ -238,6 +238,10 @@ rm -rf $RPM_BUILD_ROOT %ghost %attr(0664,root,utmp) /var/run/utmp %changelog +* Tue Apr 29 2008 Bill Nottingham - 8.74-1 +- use full path to /sbin/ip in NetworkManagerDispatcher script (#444378) +- lang.{sh,csh}: read only user customization if LANG is already set (#372151) + * Fri Apr 25 2008 Bill Nottingham - 8.73-1 - move event-compat-sysv events here, obsolete it - fix ctrl-alt-del during rc.sysinit (#444050) diff --git a/sources b/sources index 7933647..eb38756 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -0fd1866b3fb2cb26b42033e7bc0cf7c0 initscripts-8.73.tar.bz2 +8379710192c2554ebf0c0c585690ef66 initscripts-8.74.tar.bz2 From 16cb2989e8565034b38a44bde9c3a0658b64b67a Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Fri, 2 May 2008 17:32:46 +0000 Subject: [PATCH 20/35] 8.75-1 --- .cvsignore | 2 +- initscripts.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.cvsignore b/.cvsignore index 4acac76..fc292a8 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -initscripts-8.74.tar.bz2 +initscripts-8.75.tar.bz2 diff --git a/initscripts.spec b/initscripts.spec index 1e594e9..a07e8fd 100644 --- a/initscripts.spec +++ b/initscripts.spec @@ -2,7 +2,7 @@ Summary: The inittab file and the /etc/init.d scripts Name: initscripts -Version: 8.74 +Version: 8.75 # ppp-watch is GPLv2+, everything else is GPLv2 License: GPLv2 and GPLv2+ Group: System Environment/Base @@ -238,6 +238,9 @@ rm -rf $RPM_BUILD_ROOT %ghost %attr(0664,root,utmp) /var/run/utmp %changelog +* Fri May 2 2008 Bill Nottingham - 8.75-1 +- fix tcsh syntax error (#444998) + * Tue Apr 29 2008 Bill Nottingham - 8.74-1 - use full path to /sbin/ip in NetworkManagerDispatcher script (#444378) - lang.{sh,csh}: read only user customization if LANG is already set (#372151) diff --git a/sources b/sources index eb38756..d75d009 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -8379710192c2554ebf0c0c585690ef66 initscripts-8.74.tar.bz2 +df064ad303f3c8120b83ef199ea9a904 initscripts-8.75.tar.bz2 From 09b9767514670432289e808c6e3d68090a816284 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Fri, 2 May 2008 17:58:41 +0000 Subject: [PATCH 21/35] 8.76-1 --- .cvsignore | 2 +- initscripts.spec | 5 +++-- sources | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.cvsignore b/.cvsignore index fc292a8..2229de2 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -initscripts-8.75.tar.bz2 +initscripts-8.76.tar.bz2 diff --git a/initscripts.spec b/initscripts.spec index a07e8fd..9387471 100644 --- a/initscripts.spec +++ b/initscripts.spec @@ -2,7 +2,7 @@ Summary: The inittab file and the /etc/init.d scripts Name: initscripts -Version: 8.75 +Version: 8.76 # ppp-watch is GPLv2+, everything else is GPLv2 License: GPLv2 and GPLv2+ Group: System Environment/Base @@ -238,8 +238,9 @@ rm -rf $RPM_BUILD_ROOT %ghost %attr(0664,root,utmp) /var/run/utmp %changelog -* Fri May 2 2008 Bill Nottingham - 8.75-1 +* Fri May 2 2008 Bill Nottingham - 8.76-1 - fix tcsh syntax error (#444998) +- remove debugging cruft from rcS-sulogin * Tue Apr 29 2008 Bill Nottingham - 8.74-1 - use full path to /sbin/ip in NetworkManagerDispatcher script (#444378) diff --git a/sources b/sources index d75d009..ef95491 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -df064ad303f3c8120b83ef199ea9a904 initscripts-8.75.tar.bz2 +5edbf7edc843d21adf36c431e6a8e35c initscripts-8.76.tar.bz2 From 28a500a42d9e6cb9f5fefe6ba380bae74478285f Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Wed, 7 May 2008 17:56:41 +0000 Subject: [PATCH 22/35] 8.76.1-1 --- .cvsignore | 2 +- initscripts.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.cvsignore b/.cvsignore index 2229de2..f667256 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -initscripts-8.76.tar.bz2 +initscripts-8.76.1.tar.bz2 diff --git a/initscripts.spec b/initscripts.spec index 9387471..becf22b 100644 --- a/initscripts.spec +++ b/initscripts.spec @@ -2,7 +2,7 @@ Summary: The inittab file and the /etc/init.d scripts Name: initscripts -Version: 8.76 +Version: 8.76.1 # ppp-watch is GPLv2+, everything else is GPLv2 License: GPLv2 and GPLv2+ Group: System Environment/Base @@ -238,6 +238,9 @@ rm -rf $RPM_BUILD_ROOT %ghost %attr(0664,root,utmp) /var/run/utmp %changelog +* Wed May 7 2008 Bill Nottingham - 8.76.1-1 +- NMDispatcher/05-netfs: fix check for default route (#445509) + * Fri May 2 2008 Bill Nottingham - 8.76-1 - fix tcsh syntax error (#444998) - remove debugging cruft from rcS-sulogin diff --git a/sources b/sources index ef95491..f4f23b8 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -5edbf7edc843d21adf36c431e6a8e35c initscripts-8.76.tar.bz2 +27ec5bf2886d9f558a7fcf8c727dd879 initscripts-8.76.1.tar.bz2 From c4e7dfc7c8dc07f67ce85e072114084e47ed8508 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 15 May 2008 16:21:28 +0000 Subject: [PATCH 23/35] 8.76.2-1 --- .cvsignore | 2 +- initscripts.spec | 5 +---- sources | 2 +- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/.cvsignore b/.cvsignore index f667256..a71c27a 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -initscripts-8.76.1.tar.bz2 +initscripts-8.76.2.tar.bz2 diff --git a/initscripts.spec b/initscripts.spec index becf22b..9387471 100644 --- a/initscripts.spec +++ b/initscripts.spec @@ -2,7 +2,7 @@ Summary: The inittab file and the /etc/init.d scripts Name: initscripts -Version: 8.76.1 +Version: 8.76 # ppp-watch is GPLv2+, everything else is GPLv2 License: GPLv2 and GPLv2+ Group: System Environment/Base @@ -238,9 +238,6 @@ rm -rf $RPM_BUILD_ROOT %ghost %attr(0664,root,utmp) /var/run/utmp %changelog -* Wed May 7 2008 Bill Nottingham - 8.76.1-1 -- NMDispatcher/05-netfs: fix check for default route (#445509) - * Fri May 2 2008 Bill Nottingham - 8.76-1 - fix tcsh syntax error (#444998) - remove debugging cruft from rcS-sulogin diff --git a/sources b/sources index f4f23b8..432efab 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -27ec5bf2886d9f558a7fcf8c727dd879 initscripts-8.76.1.tar.bz2 +378cbe22e62ddb6e6323bf342853b628 initscripts-8.76.2.tar.bz2 From b9e7f5962405ca82c8c19669fd8a5690192399e3 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 15 May 2008 16:23:16 +0000 Subject: [PATCH 24/35] commit correct spec --- initscripts.spec | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/initscripts.spec b/initscripts.spec index 9387471..4843a1f 100644 --- a/initscripts.spec +++ b/initscripts.spec @@ -2,7 +2,7 @@ Summary: The inittab file and the /etc/init.d scripts Name: initscripts -Version: 8.76 +Version: 8.76.2 # ppp-watch is GPLv2+, everything else is GPLv2 License: GPLv2 and GPLv2+ Group: System Environment/Base @@ -238,6 +238,15 @@ rm -rf $RPM_BUILD_ROOT %ghost %attr(0664,root,utmp) /var/run/utmp %changelog +* Thu May 15 2008 Bill Nottingham - 8.76.2- +- Don't unmount sysfs in halt. (#446292) + +* Wed May 14 2008 Peter Jones +- init.d/functions: fix resolve_dm_raid() for older dmraid configs + +* Wed May 7 2008 Bill Nottingham - 8.76.1-1 +- NMDispatcher/05-netfs: fix check for default route (#445509) + * Fri May 2 2008 Bill Nottingham - 8.76-1 - fix tcsh syntax error (#444998) - remove debugging cruft from rcS-sulogin From 03d8ab955b834f5992091cc86f3f5c5b8738d9ad Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Fri, 16 May 2008 04:14:15 +0000 Subject: [PATCH 25/35] Initialize branch OLPC-3 for initscripts --- branch | 1 + 1 file changed, 1 insertion(+) create mode 100644 branch diff --git a/branch b/branch new file mode 100644 index 0000000..3a9a99c --- /dev/null +++ b/branch @@ -0,0 +1 @@ +OLPC-3 From 525084d063d52aa4b91c89acf7c6b5fd23f35c2a Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Fri, 16 May 2008 04:29:31 +0000 Subject: [PATCH 26/35] add a olpc patch --- initscripts.spec | 7 ++- olpc-initscripts.patch | 132 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 138 insertions(+), 1 deletion(-) create mode 100644 olpc-initscripts.patch diff --git a/initscripts.spec b/initscripts.spec index 4843a1f..1bd7f33 100644 --- a/initscripts.spec +++ b/initscripts.spec @@ -6,8 +6,9 @@ Version: 8.76.2 # ppp-watch is GPLv2+, everything else is GPLv2 License: GPLv2 and GPLv2+ Group: System Environment/Base -Release: 1 +Release: 1.1%{?dist} Source: initscripts-%{version}.tar.bz2 +Patch0: olpc-initscripts.patch BuildRoot: /%{_tmppath}/%{name}-%{version}-%{release}-root Requires: mingetty, /bin/awk, /bin/sed, mktemp, e2fsprogs >= 1.15 Requires: /sbin/sysctl, syslog @@ -49,6 +50,7 @@ deactivate most network interfaces. %prep %setup -q +%patch0 -p1 %build make @@ -238,6 +240,9 @@ rm -rf $RPM_BUILD_ROOT %ghost %attr(0664,root,utmp) /var/run/utmp %changelog +* Thu May 15 2008 Dennis Gilmore - 8.76.2-1.1 +- apply patch for olpc + * Thu May 15 2008 Bill Nottingham - 8.76.2- - Don't unmount sysfs in halt. (#446292) diff --git a/olpc-initscripts.patch b/olpc-initscripts.patch new file mode 100644 index 0000000..7ef061c --- /dev/null +++ b/olpc-initscripts.patch @@ -0,0 +1,132 @@ +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:21:20.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 +--- 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 @@ +-# prefdm - preferred display manager +-# +-# 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/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 -Nur 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 -Nur 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 -Nur 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 -Nur 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-15 23:19:25.000000000 -0500 +@@ -0,0 +1,16 @@ ++# ttyS0 - 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/agetty -w -n ttyS0 115200 vt100 From 8305ef9c187dd31df5ae2afaa54fb2ff3048b74b Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Fri, 16 May 2008 19:31:34 +0000 Subject: [PATCH 27/35] update olpc patch --- initscripts.spec | 5 ++++- olpc-initscripts.patch | 38 ++++++++++++++++++++++++++++++++++---- 2 files changed, 38 insertions(+), 5 deletions(-) diff --git a/initscripts.spec b/initscripts.spec index 1bd7f33..32d0a00 100644 --- a/initscripts.spec +++ b/initscripts.spec @@ -6,7 +6,7 @@ Version: 8.76.2 # ppp-watch is GPLv2+, everything else is GPLv2 License: GPLv2 and GPLv2+ Group: System Environment/Base -Release: 1.1%{?dist} +Release: 1.2%{?dist} Source: initscripts-%{version}.tar.bz2 Patch0: olpc-initscripts.patch BuildRoot: /%{_tmppath}/%{name}-%{version}-%{release}-root @@ -240,6 +240,9 @@ rm -rf $RPM_BUILD_ROOT %ghost %attr(0664,root,utmp) /var/run/utmp %changelog +* Thu May 15 2008 Dennis Gilmore - 8.76.2-1.2 +- update patch for olpc + * Thu May 15 2008 Dennis Gilmore - 8.76.2-1.1 - apply patch for olpc diff --git a/olpc-initscripts.patch b/olpc-initscripts.patch index 7ef061c..c79fc3a 100644 --- a/olpc-initscripts.patch +++ b/olpc-initscripts.patch @@ -1,6 +1,6 @@ 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:21:20.000000000 -0500 ++++ 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 +# @@ -30,6 +30,30 @@ diff -Nur initscripts-8.76.2-orig/event.d/prefdm initscripts-8.76.2/event.d/pref -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 + + 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 + + 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 --- 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 @@ -112,17 +136,17 @@ diff -Nur initscripts-8.76.2-orig/event.d/tty6 initscripts-8.76.2/event.d/tty6 -exec /sbin/mingetty tty6 diff -Nur 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-15 23:19:25.000000000 -0500 ++++ initscripts-8.76.2/event.d/ttyS0 2008-05-16 14:24:30.000000000 -0500 @@ -0,0 +1,16 @@ +# ttyS0 - getty +# -+# This service maintains a getty on tty3 from the point the system is ++# 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 ++start on started olpc-dm + +stop on runlevel 0 +stop on runlevel 1 @@ -130,3 +154,9 @@ diff -Nur initscripts-8.76.2-orig/event.d/ttyS0 initscripts-8.76.2/event.d/ttyS0 + +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 From 1b9b83251b4c4872ab0deea6044173e33155dcb1 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Fri, 6 Jun 2008 04:09:48 +0000 Subject: [PATCH 28/35] update for olpc --- initscripts.spec | 5 ++- olpc-initscripts.patch | 80 +++++++++++------------------------------- 2 files changed, 25 insertions(+), 60 deletions(-) diff --git a/initscripts.spec b/initscripts.spec index 32d0a00..ca7e16d 100644 --- a/initscripts.spec +++ b/initscripts.spec @@ -6,7 +6,7 @@ Version: 8.76.2 # 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 @@ rm -rf $RPM_BUILD_ROOT %ghost %attr(0664,root,utmp) /var/run/utmp %changelog +* Thu Jun 05 2008 Dennis Gilmore - 8.76.2-1.3 +- update olpc patch + * Thu May 15 2008 Dennis Gilmore - 8.76.2-1.2 - update patch for olpc diff --git a/olpc-initscripts.patch b/olpc-initscripts.patch index c79fc3a..82dfeae 100644 --- a/olpc-initscripts.patch +++ b/olpc-initscripts.patch @@ -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 ++# Starts olpc sugar + + start on stopped rc5 + +@@ -9,4 +9,4 @@ + 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 - - 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 - - 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 ++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 @@ diff -Nur initscripts-8.76.2-orig/event.d/tty3 initscripts-8.76.2/event.d/tty3 - -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 @@ diff -Nur initscripts-8.76.2-orig/event.d/tty4 initscripts-8.76.2/event.d/tty4 - -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 @@ diff -Nur initscripts-8.76.2-orig/event.d/tty5 initscripts-8.76.2/event.d/tty5 - -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 @@ diff -Nur initscripts-8.76.2-orig/event.d/tty6 initscripts-8.76.2/event.d/tty6 - -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 @@ diff -Nur initscripts-8.76.2-orig/event.d/ttyS0 initscripts-8.76.2/event.d/ttyS0 +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 From 3c0aa8411434b2b7df39d08bd3d606c1605ac851 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Fri, 13 Jun 2008 19:46:54 +0000 Subject: [PATCH 29/35] add patch to autologin on XO --- initscripts.spec | 7 ++++++- olpc-autologin.patch | 27 +++++++++++++++++++++++++++ 2 files changed, 33 insertions(+), 1 deletion(-) create mode 100644 olpc-autologin.patch diff --git a/initscripts.spec b/initscripts.spec index ca7e16d..889306b 100644 --- a/initscripts.spec +++ b/initscripts.spec @@ -6,9 +6,10 @@ Version: 8.76.2 # ppp-watch is GPLv2+, everything else is GPLv2 License: GPLv2 and GPLv2+ Group: System Environment/Base -Release: 1.3%{?dist} +Release: 1%{?dist}.4 Source: initscripts-%{version}.tar.bz2 Patch0: olpc-initscripts.patch +Patch1: olpc-autologin.patch BuildRoot: /%{_tmppath}/%{name}-%{version}-%{release}-root Requires: mingetty, /bin/awk, /bin/sed, mktemp, e2fsprogs >= 1.15 Requires: /sbin/sysctl, syslog @@ -51,6 +52,7 @@ deactivate most network interfaces. %prep %setup -q %patch0 -p1 +%patch1 -p1 %build make @@ -240,6 +242,9 @@ rm -rf $RPM_BUILD_ROOT %ghost %attr(0664,root,utmp) /var/run/utmp %changelog +* Fri Jun 13 2008 Dennis Gilmore - 8.76.2-1.4 +- add patch to autologin + * Thu Jun 05 2008 Dennis Gilmore - 8.76.2-1.3 - update olpc patch diff --git a/olpc-autologin.patch b/olpc-autologin.patch new file mode 100644 index 0000000..2a6e87c --- /dev/null +++ b/olpc-autologin.patch @@ -0,0 +1,27 @@ +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 From 5176e143a3d4fd0bc72246b789d1bf006ff3904e Mon Sep 17 00:00:00 2001 From: "C. Scott Ananian" Date: Fri, 27 Jun 2008 01:04:27 +0000 Subject: [PATCH 30/35] OLPC-specific improvements, forward ported from the OLPC-2 fork. Split "readonly rootfs / tmpfs" parts of original olpc patch into new 'readonly' patch; plus add additional support for preserving changes to /etc/ssh, /etc/sysconfig/i18n, /etc/timezone, /var/lib/dbus/machine-id, and /var/lib/random-seed. Add "pretty boot" support: bring up localhost before rhgb-client is invoked; some additional calls to rhgb-client; make sure that we cleanly exit pretty boot if interactive boot mode is invoked. --- initscripts-8.76.2-prettyboot.patch | 44 ++++++++++++++++++++++++++++ initscripts-8.76.2-readonly.patch | 45 +++++++++++++++++++++++++++++ initscripts.spec | 13 ++++++++- 3 files changed, 101 insertions(+), 1 deletion(-) create mode 100644 initscripts-8.76.2-prettyboot.patch create mode 100644 initscripts-8.76.2-readonly.patch diff --git a/initscripts-8.76.2-prettyboot.patch b/initscripts-8.76.2-prettyboot.patch new file mode 100644 index 0000000..5ad0a02 --- /dev/null +++ b/initscripts-8.76.2-prettyboot.patch @@ -0,0 +1,44 @@ +diff -ruHp initscripts-8.76.2.orig/rc.d/rc initscripts-8.76.2/rc.d/rc +--- initscripts-8.76.2.orig/rc.d/rc 2008-06-26 19:04:43.000000000 -0400 ++++ initscripts-8.76.2/rc.d/rc 2008-06-26 20:12:30.000000000 -0400 +@@ -43,6 +43,8 @@ UPSTART= + if [ "$previous" = "N" ]; then + if [ "$do_confirm" = "yes" ]; then + echo $"Entering interactive startup" ++ # bail out of pretty boot ++ chvt 1 + else + echo $"Entering non-interactive startup" + fi +diff -ruHp initscripts-8.76.2.orig/rc.d/rc.sysinit initscripts-8.76.2/rc.d/rc.sysinit +--- initscripts-8.76.2.orig/rc.d/rc.sysinit 2008-06-26 19:04:43.000000000 -0400 ++++ initscripts-8.76.2/rc.d/rc.sysinit 2008-06-26 20:12:30.000000000 -0400 +@@ -11,6 +11,14 @@ unamer=`uname -r` + + set -m + ++if [ -x /usr/bin/rhgb-client ] ; then ++ # OLPC's rhgb-client depends on localhost being up ++ /sbin/ip addr add 127.0.0.1/8 dev lo ++ /sbin/ip addr add ::1/128 dev lo ++ /sbin/ip link set lo up ++ /usr/bin/rhgb-client --update=sysinit-top # early "we're alive" indication ++fi ++ + if [ -f /etc/sysconfig/network ]; then + . /etc/sysconfig/network + fi +@@ -284,10 +292,13 @@ if [ -x /bin/taskset ]; then + fi + fi + ++update_boot_stage udev ++( sleep 3 ; update_boot_stage udev_mid ) & + nashpid=$(pidof nash 2>/dev/null) + [ -n "$nashpid" ] && kill $nashpid >/dev/null 2>&1 + unset nashpid + /sbin/start_udev ++update_boot_stage udev_post + + # Load other user-defined modules + for file in /etc/sysconfig/modules/*.modules ; do diff --git a/initscripts-8.76.2-readonly.patch b/initscripts-8.76.2-readonly.patch new file mode 100644 index 0000000..d04b3b1 --- /dev/null +++ b/initscripts-8.76.2-readonly.patch @@ -0,0 +1,45 @@ +diff -ruHp initscripts-8.76.2.orig/rwtab initscripts-8.76.2/rwtab +--- initscripts-8.76.2.orig/rwtab 2008-06-26 19:04:43.000000000 -0400 ++++ initscripts-8.76.2/rwtab 2008-06-26 20:07:04.000000000 -0400 +@@ -24,9 +24,7 @@ empty /var/tux + empty /media + + files /etc/adjtime +-files /etc/mtab + files /etc/ntp.conf +-files /etc/resolv.conf + files /etc/lvm/.cache + files /etc/lvm/archive + files /etc/lvm/backup +diff -ruHp initscripts-8.76.2.orig/statetab initscripts-8.76.2/statetab +--- initscripts-8.76.2.orig/statetab 2008-06-26 19:04:43.000000000 -0400 ++++ initscripts-8.76.2/statetab 2008-06-26 20:08:03.000000000 -0400 +@@ -10,3 +10,8 @@ + # /etc/ssh + # /var/spool/mail + # ++/etc/ssh ++/etc/sysconfig/i18n ++/etc/timezone ++/var/lib/dbus ++/var/lib/random-seed +diff -ruHp initscripts-8.76.2.orig/sysconfig/readonly-root initscripts-8.76.2/sysconfig/readonly-root +--- initscripts-8.76.2.orig/sysconfig/readonly-root 2008-06-26 19:04:43.000000000 -0400 ++++ initscripts-8.76.2/sysconfig/readonly-root 2008-06-26 20:08:03.000000000 -0400 +@@ -2,7 +2,7 @@ + READONLY=no + # Set to 'yes' to mount various temporary state as either tmpfs + # or on the block device labelled RW_LABEL. Implied by READONLY +-TEMPORARY_STATE=no ++TEMPORARY_STATE=yes + # Place to put a tmpfs for temporary scratch writable space + RW_MOUNT=/var/lib/stateless/writable + # Label on local filesystem which can be used for temporary scratch space +@@ -12,6 +12,6 @@ RW_OPTIONS= + # Label for partition with persistent data + STATE_LABEL=stateless-state + # Where to mount to the persistent data +-STATE_MOUNT=/var/lib/stateless/state ++STATE_MOUNT=/security/state + # Options to use for peristent mount + STATE_OPTIONS= diff --git a/initscripts.spec b/initscripts.spec index 889306b..0da463e 100644 --- a/initscripts.spec +++ b/initscripts.spec @@ -6,10 +6,12 @@ Version: 8.76.2 # ppp-watch is GPLv2+, everything else is GPLv2 License: GPLv2 and GPLv2+ Group: System Environment/Base -Release: 1%{?dist}.4 +Release: 1%{?dist}.5 Source: initscripts-%{version}.tar.bz2 Patch0: olpc-initscripts.patch Patch1: olpc-autologin.patch +Patch2: initscripts-8.76.2-readonly.patch +Patch3: initscripts-8.76.2-prettyboot.patch BuildRoot: /%{_tmppath}/%{name}-%{version}-%{release}-root Requires: mingetty, /bin/awk, /bin/sed, mktemp, e2fsprogs >= 1.15 Requires: /sbin/sysctl, syslog @@ -53,6 +55,8 @@ deactivate most network interfaces. %setup -q %patch0 -p1 %patch1 -p1 +%patch2 -p1 -b .readonly +%patch3 -p1 -b .prettyboot %build make @@ -242,6 +246,13 @@ rm -rf $RPM_BUILD_ROOT %ghost %attr(0664,root,utmp) /var/run/utmp %changelog +* Thu Jun 26 2008 C. Scott Ananian - 8.76.2-1.5 +- Turn on stateless support for OLPC; preserve /etc/ssh, /etc/sysconfig/i18n, + /etc/timezone, /var/lib/dbus/machine-id, and /var/lib/random-seed. +- Add better support for pretty boot: bring up localhost before rhgb-client + is invoked; some additional calls to rhgb-client; make sure that we cleanly + exit pretty boot if interactive boot mode is invoked. + * Fri Jun 13 2008 Dennis Gilmore - 8.76.2-1.4 - add patch to autologin From c77975e87015a097cff2c71a389ded0220e00ff9 Mon Sep 17 00:00:00 2001 From: "C. Scott Ananian" Date: Fri, 27 Jun 2008 21:29:32 +0000 Subject: [PATCH 31/35] Turn on graphical boot by default for OLPC, even if the command-line is empty. (The command-line is empty during secure boot.) --- initscripts-8.76.2-prettyboot.patch | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/initscripts-8.76.2-prettyboot.patch b/initscripts-8.76.2-prettyboot.patch index 5ad0a02..c456043 100644 --- a/initscripts-8.76.2-prettyboot.patch +++ b/initscripts-8.76.2-prettyboot.patch @@ -1,7 +1,15 @@ diff -ruHp initscripts-8.76.2.orig/rc.d/rc initscripts-8.76.2/rc.d/rc ---- initscripts-8.76.2.orig/rc.d/rc 2008-06-26 19:04:43.000000000 -0400 -+++ initscripts-8.76.2/rc.d/rc 2008-06-26 20:12:30.000000000 -0400 -@@ -43,6 +43,8 @@ UPSTART= +--- initscripts-8.76.2.orig/rc.d/rc 2008-06-27 17:03:36.000000000 -0400 ++++ initscripts-8.76.2/rc.d/rc 2008-06-27 17:27:07.000000000 -0400 +@@ -29,6 +29,7 @@ export runlevel previous + + export CONSOLETYPE + cmdline=$(cat /proc/cmdline) ++[ -x /etc/rc.d/init.d/0-boot-anim-start ] && cmdline="$cmdline rhgb" + if ! strstr "$cmdline" rhgb; then + GRAPHICAL="no" + export GRAPHICAL +@@ -43,6 +44,8 @@ UPSTART= if [ "$previous" = "N" ]; then if [ "$do_confirm" = "yes" ]; then echo $"Entering interactive startup" @@ -11,8 +19,8 @@ diff -ruHp initscripts-8.76.2.orig/rc.d/rc initscripts-8.76.2/rc.d/rc echo $"Entering non-interactive startup" fi diff -ruHp initscripts-8.76.2.orig/rc.d/rc.sysinit initscripts-8.76.2/rc.d/rc.sysinit ---- initscripts-8.76.2.orig/rc.d/rc.sysinit 2008-06-26 19:04:43.000000000 -0400 -+++ initscripts-8.76.2/rc.d/rc.sysinit 2008-06-26 20:12:30.000000000 -0400 +--- initscripts-8.76.2.orig/rc.d/rc.sysinit 2008-06-27 17:03:36.000000000 -0400 ++++ initscripts-8.76.2/rc.d/rc.sysinit 2008-06-27 17:03:44.000000000 -0400 @@ -11,6 +11,14 @@ unamer=`uname -r` set -m From 34f3efe9bea98d586e64c24cb408af303d299d6c Mon Sep 17 00:00:00 2001 From: "C. Scott Ananian" Date: Sun, 29 Jun 2008 16:05:13 +0000 Subject: [PATCH 32/35] Changelog for 8.76.2-1.6. --- initscripts.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/initscripts.spec b/initscripts.spec index 0da463e..e67db5f 100644 --- a/initscripts.spec +++ b/initscripts.spec @@ -6,7 +6,7 @@ Version: 8.76.2 # ppp-watch is GPLv2+, everything else is GPLv2 License: GPLv2 and GPLv2+ Group: System Environment/Base -Release: 1%{?dist}.5 +Release: 1%{?dist}.6 Source: initscripts-%{version}.tar.bz2 Patch0: olpc-initscripts.patch Patch1: olpc-autologin.patch @@ -246,6 +246,10 @@ rm -rf $RPM_BUILD_ROOT %ghost %attr(0664,root,utmp) /var/run/utmp %changelog +* Sat Jun 28 2008 C. Scott Ananian - 8.76.2-1.6 +- Turn on graphical boot by default to generate proper rhgb messages for + pretty boot. + * Thu Jun 26 2008 C. Scott Ananian - 8.76.2-1.5 - Turn on stateless support for OLPC; preserve /etc/ssh, /etc/sysconfig/i18n, /etc/timezone, /var/lib/dbus/machine-id, and /var/lib/random-seed. From abf189152c4ded1a20071efd31f8e064eab5b163 Mon Sep 17 00:00:00 2001 From: "C. Scott Ananian" Date: Thu, 24 Jul 2008 16:59:03 +0000 Subject: [PATCH 33/35] Unfreeze DCON after failed X start, and fail more quickly when there are problems. Change default runlevel to 5 (replacing an uglier patch to do this in our image creation tool). Remove a redundant udev console initialization which causes the screen to flash during prettyboot (dlo trac #3569). This replaces an uglier patch to do this in our image creation tool. Set up keymap when hal sees an OLPC keyboard. This replaces an uglier patch in our image creation tool. --- initscripts-8.76.2-prettyboot.patch | 16 ++++++++++++++++ initscripts.spec | 23 ++++++++++++++++++++++- olpc-runlevel.patch | 8 ++++++++ olpc-setolpckeys.patch | 5 +++++ olpc-xstartup.patch | 14 ++++++++++++++ 5 files changed, 65 insertions(+), 1 deletion(-) create mode 100644 olpc-runlevel.patch create mode 100644 olpc-setolpckeys.patch create mode 100644 olpc-xstartup.patch diff --git a/initscripts-8.76.2-prettyboot.patch b/initscripts-8.76.2-prettyboot.patch index c456043..282290a 100644 --- a/initscripts-8.76.2-prettyboot.patch +++ b/initscripts-8.76.2-prettyboot.patch @@ -50,3 +50,19 @@ diff -ruHp initscripts-8.76.2.orig/rc.d/rc.sysinit initscripts-8.76.2/rc.d/rc.sy # Load other user-defined modules for file in /etc/sysconfig/modules/*.modules ; do +diff -ruHp initscripts-8.76.2.orig/udev/rules.d/10-console.rules initscripts-8.76.2/udev/rules.d/10-console.rules +--- initscripts-8.76.2.orig/udev/rules.d/10-console.rules 2008-07-24 12:26:56.000000000 -0400 ++++ initscripts-8.76.2/udev/rules.d/10-console.rules 2008-07-24 12:29:15.000000000 -0400 +@@ -1,5 +1,11 @@ + # Console initialization - keyboard, font, etc. +-KERNEL=="tty0", RUN+="/lib/udev/console_init %k" ++# OLPC: commented out to remove tty0 udev initialization, which takes ++# place during pretty boot and makes the screen flash (dlo trac #3569). ++# We set up the console ourselves, both in ++# 96-olpc-keyboard.rules as well as in olpc-configure, and we ++# set the appropriate font in /etc/init.d/z-boot-anim-stop -- so ++# this is completely unnecessary. ++#KERNEL=="tty0", RUN+="/lib/udev/console_init %k" + + # Check and set up serial and serial-like consoles if necessary + KERNEL=="console", RUN+="/lib/udev/console_check %k" diff --git a/initscripts.spec b/initscripts.spec index e67db5f..0f49a49 100644 --- a/initscripts.spec +++ b/initscripts.spec @@ -6,12 +6,15 @@ Version: 8.76.2 # ppp-watch is GPLv2+, everything else is GPLv2 License: GPLv2 and GPLv2+ Group: System Environment/Base -Release: 1%{?dist}.6 +Release: 1%{?dist}.7 Source: initscripts-%{version}.tar.bz2 Patch0: olpc-initscripts.patch Patch1: olpc-autologin.patch Patch2: initscripts-8.76.2-readonly.patch Patch3: initscripts-8.76.2-prettyboot.patch +Patch4: olpc-xstartup.patch +Patch5: olpc-runlevel.patch +Patch6: olpc-setolpckeys.patch BuildRoot: /%{_tmppath}/%{name}-%{version}-%{release}-root Requires: mingetty, /bin/awk, /bin/sed, mktemp, e2fsprogs >= 1.15 Requires: /sbin/sysctl, syslog @@ -57,6 +60,13 @@ deactivate most network interfaces. %patch1 -p1 %patch2 -p1 -b .readonly %patch3 -p1 -b .prettyboot +%patch4 -p1 -b .xstartup +%patch5 -p1 -b .runlevel +%patch6 -p1 -b .setolpckeys +# clean up patch backup files which would otherwise get copied into the +# RPM. +rm -f udev/rules.d/*.prettyboot udev/rules.d/*.setolpckeys +rm -f event.d/*.xstartup %build make @@ -246,6 +256,17 @@ rm -rf $RPM_BUILD_ROOT %ghost %attr(0664,root,utmp) /var/run/utmp %changelog +* Wed Jul 23 2008 C. Scott Ananian - 8.76.2-1.7 +- Unfreeze DCON after failed X start, and fail more quickly when there + are problems. +- Change default runlevel to 5 (replacing an uglier patch to do this + in our image creation tool). +- Remove a redundant udev console initialization which causes the + screen to flash during prettyboot (dlo trac #3569). This replaces + an uglier patch to do this in our image creation tool. +- Set up keymap when hal sees an OLPC keyboard. This replaces an + uglier patch in our image creation tool. + * Sat Jun 28 2008 C. Scott Ananian - 8.76.2-1.6 - Turn on graphical boot by default to generate proper rhgb messages for pretty boot. diff --git a/olpc-runlevel.patch b/olpc-runlevel.patch new file mode 100644 index 0000000..cd90cb6 --- /dev/null +++ b/olpc-runlevel.patch @@ -0,0 +1,8 @@ +--- 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: diff --git a/olpc-setolpckeys.patch b/olpc-setolpckeys.patch new file mode 100644 index 0000000..458fed5 --- /dev/null +++ b/olpc-setolpckeys.patch @@ -0,0 +1,5 @@ +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" diff --git a/olpc-xstartup.patch b/olpc-xstartup.patch new file mode 100644 index 0000000..be74f03 --- /dev/null +++ b/olpc-xstartup.patch @@ -0,0 +1,14 @@ +--- 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 From 10e3fe79e9c09da59a203936ccc1007d986d0c58 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Wed, 28 Oct 2009 02:54:41 +0000 Subject: [PATCH 34/35] Fix typo from bad import script. (releng #2781) --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 3ace173..9f6d2fb 100644 --- a/Makefile +++ b/Makefile @@ -1,10 +1,10 @@ # Makefile for source rpm: initscripts -# $Id: Makefile,v 1.1 2004/09/09 06:14:14 cvsdist Exp $ +# $Id: Makefile,v 1.2 2007/10/15 18:53:00 notting Exp $ NAME := initscripts SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) From ed1c722c0201d2f31fe2dd1def24fb7b5a70b954 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 28 Jul 2010 18:16:43 +0000 Subject: [PATCH 35/35] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- branch | 1 - 3 files changed, 22 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile delete mode 100644 branch diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index 9f6d2fb..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: initscripts -# $Id: Makefile,v 1.2 2007/10/15 18:53:00 notting Exp $ -NAME := initscripts -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attempt a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) diff --git a/branch b/branch deleted file mode 100644 index 3a9a99c..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -OLPC-3