* Re: [ANNOUNCE] 2004-01-05 release of hotplug scripts
2004-01-05 18:30 [ANNOUNCE] 2004-01-05 release of hotplug scripts Greg KH
@ 2004-01-05 18:43 ` Måns Rullgård
2004-01-05 20:26 ` Marco d'Itri
` (8 subsequent siblings)
9 siblings, 0 replies; 11+ messages in thread
From: Måns Rullgård @ 2004-01-05 18:43 UTC (permalink / raw)
To: linux-kernel; +Cc: linux-hotplug-devel, linux-usb-devel, linux-usb-users
[-- 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: 34 bytes --]
--
Måns Rullgård
mru@kth.se
^ permalink raw reply [flat|nested] 11+ messages in thread* Re: [ANNOUNCE] 2004-01-05 release of hotplug scripts
2004-01-05 18:30 [ANNOUNCE] 2004-01-05 release of hotplug scripts Greg KH
2004-01-05 18:43 ` Måns Rullgård
@ 2004-01-05 20:26 ` Marco d'Itri
2004-01-05 21:39 ` wwp
` (7 subsequent siblings)
9 siblings, 0 replies; 11+ messages in thread
From: Marco d'Itri @ 2004-01-05 20:26 UTC (permalink / raw)
To: linux-hotplug
On Jan 05, Greg KH <greg@kroah.com> wrote:
>I've just packaged up the latest Linux hotplug scripts into a release,
What about my cleanup patches?
--
ciao, |
Marco | [3931 inHKpKwK3RQ7g]
-------------------------------------------------------
This SF.net email is sponsored by: IBM Linux Tutorials.
Become an expert in LINUX or just sharpen your skills. Sign up for IBM's
Free Linux Tutorials. Learn everything from the bash shell to sys admin.
Click now! http://ads.osdn.com/?ad_id\x1278&alloc_id371&op=click
_______________________________________________
Linux-hotplug-devel mailing list http://linux-hotplug.sourceforge.net
Linux-hotplug-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/linux-hotplug-devel
^ permalink raw reply [flat|nested] 11+ messages in thread* Re: [ANNOUNCE] 2004-01-05 release of hotplug scripts
2004-01-05 18:30 [ANNOUNCE] 2004-01-05 release of hotplug scripts Greg KH
2004-01-05 18:43 ` Måns Rullgård
2004-01-05 20:26 ` Marco d'Itri
@ 2004-01-05 21:39 ` wwp
2004-01-05 22:24 ` Greg KH
` (6 subsequent siblings)
9 siblings, 0 replies; 11+ messages in thread
From: wwp @ 2004-01-05 21:39 UTC (permalink / raw)
To: linux-hotplug
[-- Attachment #1: Type: text/plain, Size: 605 bytes --]
Hi Greg KH,
On Mon, 5 Jan 2004 10:30:58 -0800 Greg KH <greg@kroah.com> 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
Thanx for this new release!
Did you see my (ridiculously small) patch submission? I never got even
a reply ;-), maybe you found it unrelevant?
It was:
Date: Sun, 23 Nov 2003 00:34:27 +0100
Subject: patch proposal: verbosity
Applied upon my SuSE 8.x, it provides (IMO) more logical verbosity.
Patch is attached to this message, in case.
Regards,
--
wwp
[-- Attachment #2: hotplug.functions.patch --]
[-- Type: application/octet-stream, Size: 369 bytes --]
--- hotplug.functions.orig 2003-06-28 02:13:10.000000000 +0200
+++ hotplug.functions 2003-11-23 00:23:42.000000000 +0100
@@ -158,6 +158,9 @@
# (ioctls etc) not in setup scripts or modules.conf
LOADED=true
fi
+ else
+ debug_mesg "... already loaded module: $MODULE"
+ LOADED=true
fi
# always run setup scripts after any matching kernel code has had
^ permalink raw reply [flat|nested] 11+ messages in thread* Re: [ANNOUNCE] 2004-01-05 release of hotplug scripts
2004-01-05 18:30 [ANNOUNCE] 2004-01-05 release of hotplug scripts Greg KH
` (2 preceding siblings ...)
2004-01-05 21:39 ` wwp
@ 2004-01-05 22:24 ` Greg KH
2004-01-05 22:24 ` Greg KH
` (5 subsequent siblings)
9 siblings, 0 replies; 11+ messages in thread
From: Greg KH @ 2004-01-05 22:24 UTC (permalink / raw)
To: linux-hotplug
On Mon, Jan 05, 2004 at 09:26:50PM +0100, Marco d'Itri wrote:
> On Jan 05, Greg KH <greg@kroah.com> wrote:
>
> >I've just packaged up the latest Linux hotplug scripts into a release,
> What about my cleanup patches?
The "don't rely on bash" patches? I've left them up to Dave to apply or
not, as I don't have a good enough grasp of shell programming to make a
wise call on them.
thanks,
greg k-h
-------------------------------------------------------
This SF.net email is sponsored by: IBM Linux Tutorials.
Become an expert in LINUX or just sharpen your skills. Sign up for IBM's
Free Linux Tutorials. Learn everything from the bash shell to sys admin.
Click now! http://ads.osdn.com/?ad_id\x1278&alloc_id371&op=click
_______________________________________________
Linux-hotplug-devel mailing list http://linux-hotplug.sourceforge.net
Linux-hotplug-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/linux-hotplug-devel
^ permalink raw reply [flat|nested] 11+ messages in thread* Re: [ANNOUNCE] 2004-01-05 release of hotplug scripts
2004-01-05 18:30 [ANNOUNCE] 2004-01-05 release of hotplug scripts Greg KH
` (3 preceding siblings ...)
2004-01-05 22:24 ` Greg KH
@ 2004-01-05 22:24 ` Greg KH
2004-01-05 23:27 ` David Brownell
` (4 subsequent siblings)
9 siblings, 0 replies; 11+ messages in thread
From: Greg KH @ 2004-01-05 22:24 UTC (permalink / raw)
To: linux-hotplug
On Mon, Jan 05, 2004 at 10:39:39PM +0100, wwp wrote:
> Hi Greg KH,
>
>
> On Mon, 5 Jan 2004 10:30:58 -0800 Greg KH <greg@kroah.com> 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\x17679
>
> Thanx for this new release!
>
> Did you see my (ridiculously small) patch submission? I never got even
> a reply ;-), maybe you found it unrelevant?
>
> It was:
> Date: Sun, 23 Nov 2003 00:34:27 +0100
> Subject: patch proposal: verbosity
>
> Applied upon my SuSE 8.x, it provides (IMO) more logical verbosity.
> Patch is attached to this message, in case.
But this patch doesn't apply to the latest release, does it?
thanks,
greg k-h
-------------------------------------------------------
This SF.net email is sponsored by: IBM Linux Tutorials.
Become an expert in LINUX or just sharpen your skills. Sign up for IBM's
Free Linux Tutorials. Learn everything from the bash shell to sys admin.
Click now! http://ads.osdn.com/?ad_id\x1278&alloc_id371&op=click
_______________________________________________
Linux-hotplug-devel mailing list http://linux-hotplug.sourceforge.net
Linux-hotplug-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/linux-hotplug-devel
^ permalink raw reply [flat|nested] 11+ messages in thread* Re: [ANNOUNCE] 2004-01-05 release of hotplug scripts
2004-01-05 18:30 [ANNOUNCE] 2004-01-05 release of hotplug scripts Greg KH
` (4 preceding siblings ...)
2004-01-05 22:24 ` Greg KH
@ 2004-01-05 23:27 ` David Brownell
2004-03-29 15:45 ` Måns Rullgård
` (3 subsequent siblings)
9 siblings, 0 replies; 11+ messages in thread
From: David Brownell @ 2004-01-05 23:27 UTC (permalink / raw)
To: linux-hotplug
> The "don't rely on bash" patches? I've left them up to Dave to apply or
> not, as I don't have a good enough grasp of shell programming to make a
> wise call on them.
In general I'm in favor of them.
Please resend patches like that (and SuSE-friendly ones too) against
this latest release, to make sure they get to the top of my backlog
of hotplug patches ... else I may miss them.
- Dave
-------------------------------------------------------
This SF.net email is sponsored by: IBM Linux Tutorials.
Become an expert in LINUX or just sharpen your skills. Sign up for IBM's
Free Linux Tutorials. Learn everything from the bash shell to sys admin.
Click now! http://ads.osdn.com/?ad_id\x1278&alloc_id371&op=click
_______________________________________________
Linux-hotplug-devel mailing list http://linux-hotplug.sourceforge.net
Linux-hotplug-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/linux-hotplug-devel
^ permalink raw reply [flat|nested] 11+ messages in thread* Re: [ANNOUNCE] 2004-01-05 release of hotplug scripts
2004-01-05 18:30 [ANNOUNCE] 2004-01-05 release of hotplug scripts Greg KH
` (5 preceding siblings ...)
2004-01-05 23:27 ` David Brownell
@ 2004-03-29 15:45 ` Måns Rullgård
2004-03-29 15:45 ` Martin Schlemmer
` (2 subsequent siblings)
9 siblings, 0 replies; 11+ messages in thread
From: Måns Rullgård @ 2004-03-29 15:45 UTC (permalink / raw)
To: linux-hotplug
[-- 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.
[-- 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: 34 bytes --]
--
Måns Rullgård
mru@kth.se
^ permalink raw reply [flat|nested] 11+ messages in thread* Re: [ANNOUNCE] 2004-01-05 release of hotplug scripts
2004-01-05 18:30 [ANNOUNCE] 2004-01-05 release of hotplug scripts Greg KH
` (6 preceding siblings ...)
2004-03-29 15:45 ` Måns Rullgård
@ 2004-03-29 15:45 ` Martin Schlemmer
2004-03-29 15:45 ` Martin Schlemmer
2004-03-29 15:45 ` Måns Rullgård
9 siblings, 0 replies; 11+ messages in thread
From: Martin Schlemmer @ 2004-03-29 15:45 UTC (permalink / raw)
To: linux-hotplug
[-- 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 --]
^ permalink raw reply [flat|nested] 11+ messages in thread* Re: [ANNOUNCE] 2004-01-05 release of hotplug scripts
2004-01-05 18:30 [ANNOUNCE] 2004-01-05 release of hotplug scripts Greg KH
` (7 preceding siblings ...)
2004-03-29 15:45 ` Martin Schlemmer
@ 2004-03-29 15:45 ` Martin Schlemmer
2004-03-29 15:45 ` Måns Rullgård
9 siblings, 0 replies; 11+ messages in thread
From: Martin Schlemmer @ 2004-03-29 15:45 UTC (permalink / raw)
To: linux-hotplug
[-- 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 --]
^ permalink raw reply [flat|nested] 11+ messages in thread* Re: [ANNOUNCE] 2004-01-05 release of hotplug scripts
2004-01-05 18:30 [ANNOUNCE] 2004-01-05 release of hotplug scripts Greg KH
` (8 preceding siblings ...)
2004-03-29 15:45 ` Martin Schlemmer
@ 2004-03-29 15:45 ` Måns Rullgård
9 siblings, 0 replies; 11+ messages in thread
From: Måns Rullgård @ 2004-03-29 15:45 UTC (permalink / raw)
To: linux-hotplug
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
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
-------------------------------------------------------
This SF.Net email is sponsored by: IBM Linux Tutorials
Free Linux tutorial presented by Daniel Robbins, President and CEO of
GenToo technologies. Learn everything from fundamentals to system
administration.http://ads.osdn.com/?ad_id\x1470&alloc_id638&opÌk
_______________________________________________
Linux-hotplug-devel mailing list http://linux-hotplug.sourceforge.net
Linux-hotplug-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/linux-hotplug-devel
^ permalink raw reply [flat|nested] 11+ messages in thread