[ANNOUNCE] 2004-01-05 release of hotplug scripts

[ANNOUNCE] 2004-01-05 release of hotplug scripts

[Greg KH]

I've just packaged up the latest Linux hotplug scripts into a release,
which can be found at:
 	http://sourceforge.net/project/showfiles.php?group_id=17679
 
Or from your favorite kernel.org mirror at:
	kernel.org/pub/linux/utils/kernel/hotplug/hotplug-2004_01_05.tar.gz
or for those who like bz2 packages:
	kernel.org/pub/linux/utils/kernel/hotplug/hotplug-2004_01_05.tar.bz2

I've also packaged up some pre-built (and signed) Red Hat FC 1 based rpms:
	kernel.org/pub/linux/utils/kernel/hotplug/hotplug-2004_01_05-1.noarch.rpm
	kernel.org/pub/linux/utils/kernel/hotplug/hotplug-base-2004_01_05-1.noarch.rpm

The source rpm is available if you want to rebuild it for other distros
or versions of Red Hat at:
	kernel.org/pub/linux/utils/kernel/hotplug/hotplug-2004_01_05-1.src.rpm
	kernel.org/pub/linux/utils/kernel/hotplug/hotplug-2004_01_05-1.src.rpm
 
The main web site for the linux-hotplug project can be found at:
	http://linux-hotplug.sf.net/
which contains lots of documentation on the whole linux-hotplug
process.

This release is recommended for _anyone_ using the 2.6.0 and beyond
kernels who is still using hotplug scripts older than 2003_08_05, as a
number of changes have been made in order to support the 2.6 kernel
properly.
	
The release is still backwards compatible with 2.4, so there is no need
to worry about upgrading.

The full ChangeLog extract since the last release is included below for
those who want to know everything that's been changed, and who to blame
for them :)

thanks,

greg k-h
 
--------------

Mon Jan 5 2004 kroah
        - 2004_01_05 release

Mon Oct 13 2003 kroah
        - sysfs entries for usb devices are in hex.  Patch from Andrey
          Borzenkov <arvidjaar@mail.ru>
        - add input.rc and input.agent for input systems.  Patch from Andrey
          Borzenkov <arvidjaar@mail.ru>

Tue Oct 7 2003 kroah
        - keep already loaded modules from causing messages in the syslog.
        - added firmware.agent file from Marcel Holtmann <marcel@holtmann.org>
        - Lots of patches from Bill Nottingham <notting@redhat.com> to try to
          sync back up with the Red Hat hotplug package:
                - hotplug-2003_08_05-networkdown.patch
                  Don't bring up network devices if the network service isn't
                  started.
                - hotplug-2002_04_01-joydev.patch
                  Some extra joystick devices.
                - hotplug-2003_08_05-tunnel.patch
                  Exclude tunl*/tun*/tap* from being brought up via hotplug
                  events
                - hotplug-2002_04_01-wacom.patch
                  Some wacom tablets for evdev.
                - hotplug-2002_04_01-usblcd.patch
                  usblcd mappings
                - hotplug-2002_04_01-inhotplug.patch
                  Set IN_HOTPLUG environment variable as something users can
                  check in case they don't want some interface to be
                  automatically brought up.
                - hotplug-2003_08_05-updfstab.patch
                  Run updfstab on usb-storage insertion, and general removal
                  (Probably needs to run on firewire, and other sorts of
                  removal devices). upfstab is a Red Hat specific program that
                  edits /etc/fstab to add entries for removable devices.
        - added dasd (s390 stuff) tape and dasd agent files from SuSE and Red
          Hat's hotplug package.

Wed Sep 24 2003 kroah
        - fixed status display of usb drivers in the 2.6 kernel as
          /proc/bus/usb/drivers is no longer present.
        - fixed typo in the /sbin/hotplug comments as found by
          Gary_Lerhaupt@Dell.com

Tue Sep 16 2003 kroah
        - remove devlabel calls, it should just put its own link in
          /etc/hotplug.d

Re: [ANNOUNCE] 2004-01-05 release of hotplug scripts

[Måns Rullgård]

[-- Attachment #1: Type: text/plain, Size: 380 bytes --]

Greg KH <greg@kroah.com> writes:

> This release is recommended for _anyone_ using the 2.6.0 and beyond
> kernels who is still using hotplug scripts older than 2003_08_05, as a
> number of changes have been made in order to support the 2.6 kernel
> properly.

This patch makes things work better on my laptop running linux
2.6.1-rc1.  Most likely it can be done in a better way.


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: hotplug-linux2.6.diff --]
[-- Type: text/x-patch, Size: 2680 bytes --]

Index: etc/hotplug/hotplug.functions
===================================================================
RCS file: /cvsroot/linux-hotplug/admin/etc/hotplug/hotplug.functions,v
retrieving revision 1.22
diff -u -r1.22 hotplug.functions
--- etc/hotplug/hotplug.functions	7 Oct 2003 21:15:38 -0000	1.22
+++ etc/hotplug/hotplug.functions	5 Jan 2004 18:33:33 -0000
@@ -139,7 +139,7 @@
     do
 	# maybe driver modules need loading
         LOADED=false
-	if ! lsmod | grep -q "^$MODULE " > /dev/null 2>&1; then
+	if ! lsmod | grep -q "^${MODULE//-/_} " > /dev/null 2>&1; then
 	    if grep -q "^$MODULE\$" $HOTPLUG_DIR/blacklist \
 		    >/dev/null 2>&1; then
 		debug_mesg "... blacklisted module:  $MODULE"
Index: etc/hotplug/pci.agent
===================================================================
RCS file: /cvsroot/linux-hotplug/admin/etc/hotplug/pci.agent,v
retrieving revision 1.13
diff -u -r1.13 pci.agent
--- etc/hotplug/pci.agent	16 Sep 2003 19:42:17 -0000	1.13
+++ etc/hotplug/pci.agent	5 Jan 2004 18:33:33 -0000
@@ -147,7 +147,7 @@
 add)
     pci_convert_vars
 
-    LABEL="PCI slot $PCI_SLOT_NAME"
+    LABEL="PCI slot $PCI_SLOT"
 
     # on 2.4 systems, modutils maintains MAP_CURRENT
     if [ -r $MAP_CURRENT ]; then
Index: etc/hotplug/pci.rc
===================================================================
RCS file: /cvsroot/linux-hotplug/admin/etc/hotplug/pci.rc,v
retrieving revision 1.7
diff -u -r1.7 pci.rc
--- etc/hotplug/pci.rc	6 Jun 2003 18:27:23 -0000	1.7
+++ etc/hotplug/pci.rc	5 Jan 2004 18:33:33 -0000
@@ -25,6 +25,11 @@
 #     . /etc/sysconfig/pci
 # fi
 
+sys_file ()
+{
+    cut -f2 -dx $DEVICE/$1
+}
+
 pci_boot_events ()
 {
     #
@@ -46,14 +51,27 @@
     PCI_SUBSYS_ID=0:0
     export ACTION PCI_CLASS PCI_ID PCI_SLOT PCI_SUBSYS_ID
 
-    # these notifications will be handled by pcimodules
-    for BUS in `cd /proc/bus/pci;find * -type d -print`; do
-	for SLOT_FUNC in `cd /proc/bus/pci/$BUS; echo *`; do
-	    PCI_SLOT=$BUS:$SLOT_FUNC
-	    : hotplug pci for $PCI_SLOT
-	    /sbin/hotplug pci
+    case $KERNEL in
+	2.5*|2.6*)
+	    for DEVICE in /sys/bus/pci/devices/*; do
+		PCI_CLASS=`sys_file class`
+		PCI_ID=`sys_file vendor`:`sys_file device`
+		PCI_SLOT=`echo $DEVICE | cut -d: -f2-`
+		PCI_SUBSYS_ID=`sys_file subsystem_vendor`:`sys_file subsystem_device`
+		/sbin/hotplug pci
+	    done
+	    ;;
+	2.4*)
+	# these notifications will be handled by pcimodules
+	for BUS in `cd /proc/bus/pci;find * -type d -print`; do
+	    for SLOT_FUNC in `cd /proc/bus/pci/$BUS; echo *`; do
+		PCI_SLOT=$BUS:$SLOT_FUNC
+		: hotplug pci for $PCI_SLOT
+		/sbin/hotplug pci
+	    done
 	done
-    done
+	;;
+    esac
 }
 
 # See how we were called.

[-- Attachment #3: Type: text/plain, Size: 30 bytes --]


-- 
Måns Rullgård
mru@kth.se

Re: [ANNOUNCE] 2004-01-05 release of hotplug scripts

[Martin Schlemmer]

[-- Attachment #1.1: Type: text/plain, Size: 331 bytes --]

On Mon, 2004-01-05 at 20:30, Greg KH wrote:
> I've just packaged up the latest Linux hotplug scripts into a release,
> which can be found at:
>  	http://sourceforge.net/project/showfiles.php?group_id=17679
>  

Seems there is an issue with hotplug.functions .. attached correct
patch?


Thanks,

-- 
Martin Schlemmer

[-- Attachment #1.2: hotplug-type_o.patch --]
[-- Type: text/x-patch, Size: 393 bytes --]

--- 1/etc/hotplug/hotplug.functions	2004-01-06 00:07:53.085582176 +0200
+++ 2/etc/hotplug/hotplug.functions	2004-01-06 00:15:26.015726328 +0200
@@ -154,9 +154,6 @@
 		# (ioctls etc) not in setup scripts or modules.conf
 		LOADED=true
 	    fi
-	else
-	    # This module is already loaded
-	    LOADED=true
 	fi
 
 	# always run setup scripts after any matching kernel code has had

[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 189 bytes --]

Re: [ANNOUNCE] 2004-01-05 release of hotplug scripts

[Martin Schlemmer]

[-- Attachment #1: Type: text/plain, Size: 515 bytes --]

On Tue, 2004-01-06 at 00:19, Martin Schlemmer wrote:
> On Mon, 2004-01-05 at 20:30, Greg KH wrote:
> > I've just packaged up the latest Linux hotplug scripts into a release,
> > which can be found at:
> >  	http://sourceforge.net/project/showfiles.php?group_id=17679
> >  
> 
> Seems there is an issue with hotplug.functions .. attached correct
> patch?

Err, do not worry - seemed like I missed an patch we had for this
(was not in same section of the build file).


Sorry,

-- 
Martin Schlemmer

[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 189 bytes --]

Re: [ANNOUNCE] 2004-01-05 release of hotplug scripts

[Måns Rullgård]

Martin Schlemmer <azarah@nosferatu.za.org> writes:

> Seems there is an issue with hotplug.functions .. attached correct
> patch?

It's not correct.  It's got ^M line ends.

-- 
Måns Rullgård
mru@kth.se