7.70-1

2 files changed, 91 insertions, 3 deletions

diff --git a/ChangeLog b/ChangeLog
index 4a885242..b04f5fb7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,81 @@
+2004-08-26  Bill Nottingham  <notting@redhat.com>
+
+	* ChangeLog, initscripts.spec: 7.70-1
+
+	* rc.d/rc.sysinit, src/Makefile, src/kmodule.c:
+	autoloading of hardware at boot time
+
+2004-08-26  Chester Cheng  <ccheng@redhat.com>
+
+	* po/zh_TW.po: *** empty log message ***
+
+2004-08-25  Bill Nottingham  <notting@redhat.com>
+
+	* rc.d/rc.sysinit:
+	minor cleanup (#115028, <leonard-rh-bugzilla@den.ottolander.nl>)
+
+	* sysconfig/network-scripts/ifup: support STP bridging (#123324)
+
+	* rc.d/rc.sysinit: do a SELinux relabel if forced
+
+	* rc.d/rc.sysinit: remove devfs compat and 2.4 compat
+
+	* sysconfig/network-scripts/ifup-wireless:
+	support multiple keys (#127957)
+
+	* sysconfig/network-scripts/network-functions:
+	fix firmware loading (#129155, <bnocera@redhat.com>)
+
+	* sysconfig/network-scripts/network-functions:
+	fix firmware loading (#129155)
+
+2004-08-24  Karsten Hopp  <karsten@redhat.com>
+
+	* initscripts.spec, rc.d/rc.sysinit:
+	- configure all zfcp (scsi over fibrechannel) devices before trying to mount them (mainframe)
+
+2004-08-23  Jason Vas Dias  <jvdias@redhat.com>
+
+	* initscripts.spec, sysconfig/network-scripts/network-functions:
+	 fix resolv.conf merge if pre-existing resolv.conf nonexistent or empty
+
+2004-08-23  Amanpreet Singh Alam  <amanlinux@netscape.net>
+
+	* po/pa.po: final
+
+2004-08-20  Jason Vas Dias  <jvdias@redhat.com>
+
+	* initscripts.spec:
+	Preserve options in resolv.conf; Allow users to use generic /etc/dhclient.conf
+
+2004-08-20  Bill Nottingham  <notting@redhat.com>
+
+	* sysconfig/network-scripts/ifup-post: remove wackycomment
+
+	* sysconfig/network-scripts/network-functions: remove unneeded line
+
+2004-08-20  Jason Vas Dias  <jvdias@redhat.com>
+
+	* sysconfig/network-scripts/ifup:
+	Allow users to use generic /etc/dhclient.conf if per-device file non-existent or empty
+
+	* sysconfig/network-scripts/network-functions:
+	Fix for 125712: preserve options in resolv.conf
+
+2004-08-20  Jeremy Katz  <katzj@redhat.com>
+
+	* initscripts.spec, rc.d/rc.sysinit:
+	* Fri Aug 20 2004 Jeremy Katz <katzj@redhat.com> - 7.65-1
+	- look at /etc/udev/udev.conf, not /etc/sysconfig/udev (#130431)
+
+2004-08-20  Bill Nottingham  <notting@redhat.com>
+
+	* initscripts.spec: duh
+
+	* ChangeLog, initscripts.spec: 7.64-1
+
+	* rc.d/rc.sysinit: check for dev file too (#130350)
+
 2004-08-20  Bill Nottingham  <notting@redhat.com>
 
 	* ChangeLog, initscripts.spec: 7.64-1
diff --git a/initscripts.spec b/initscripts.spec
index 3a19770f..d9f03af6 100644
--- a/initscripts.spec
+++ b/initscripts.spec
@@ -1,6 +1,5 @@
 Summary: The inittab file and the /etc/init.d scripts.
-Name: initscripts
-Version: 7.68
+Version: 7.70
 License: GPL
 Group: System Environment/Base
 Release: 1
@@ -18,11 +17,12 @@ Requires: /sbin/ip, /sbin/arping, net-tools
 Requires: /etc/redhat-release, dev
 Requires: ethtool >= 1.8-2
 Conflicts: mkinitrd < 4.0
-Conflicts: kernel <= 2.4, timeconfig < 3.0, ppp < 2.3.9, wvdial < 1.40-3
+Conflicts: kernel <= 2.6, timeconfig < 3.0, ppp < 2.3.9, wvdial < 1.40-3
 Conflicts: ypbind < 1.6-12, psacct < 6.3.2-12, kbd < 1.06-19, lokkit < 0.50-14
 Obsoletes: rhsound sapinit
 Prereq: /sbin/chkconfig, /usr/sbin/groupadd, gawk, fileutils, sh-utils
 BuildPrereq: glib2-devel popt gettext pkgconfig
+BuildPrereq: kudzu-devel >= 1.1.80
 
 %description
 The initscripts package contains the basic system scripts used to boot
@@ -229,6 +229,7 @@ rm -rf $RPM_BUILD_ROOT
 /sbin/consoletype
 /sbin/genhostid
 /sbin/getkey
+/sbin/kmodule
 %attr(2755,root,root) /sbin/netreport
 /sbin/initlog
 /sbin/minilogd
@@ -250,6 +251,15 @@ rm -rf $RPM_BUILD_ROOT
 %ghost %attr(0664,root,utmp) /var/run/utmp
 
 %changelog
+* Thu Aug 26 2004 Bill Nottingham <notting@redhat.com> 7.70-1
+- autoload hardware modules on startup
+- minor fsck cleanup (#115028, <leonard-rh-bugzilla@den.ottolander.nl>)
+- ifup: support STP bridging (#123324)
+- rc.sysinit: do a SELinux relabel if forced
+- rc.sysinit: remove devfs compat and the remaining 2.4 compat
+- ifup-wireless: support multiple keys (#127957)
+- fix firmware loading (#129155, <bnocera@redhat.com>)
+	
 * Tue Aug 24 2004 Karsten Hopp <karsten@redhat.de> 7.68-1 
 - execute zfcfconf.sh if available (mainframe)