[PATCH] udev: install distro specific firmware handler

[PATCH] udev: install distro specific firmware handler

[Philippe Seewer]

Debian Unstable still calls its firmware handling script
'firmware.agent' instead of 'firmware.sh'. This patch ensures that
either the .agent or the .sh gets installed.
---
 modules.d/95udev-rules/install |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/modules.d/95udev-rules/install b/modules.d/95udev-rules/install
index b903a41..287cc03 100755
--- a/modules.d/95udev-rules/install
+++ b/modules.d/95udev-rules/install
@@ -15,7 +15,9 @@ inst_rules "$moddir/01-ignore.rules"
 
 # for firmware loading
 inst_rules 50-firmware.rules
-dracut_install /lib/udev/firmware.sh
+for i in firmware.sh firmware.agent hotplug.functions ; do
+    [ -e /lib/udev/$i ] && dracut_install /lib/udev/$i
+done
 dracut_install cat uname
 
 if [ ! -x /lib/udev/vol_id ]; then
@@ -31,7 +33,6 @@ ata_id \
 cdrom_id \
 create_floppy_devices \
 edd_id \
-firmware.sh \
 fw_unit_symlinks.sh \
 hid2hci \
 path_id \
-- 
1.7.0

Re: [PATCH] udev: install distro specific firmware handler

[Andrey Borzenkov]

[-- Attachment #1: Type: Text/Plain, Size: 1025 bytes --]

On Friday 26 of February 2010 17:39:29 Philippe Seewer wrote:
> Debian Unstable still calls its firmware handling script
> 'firmware.agent' instead of 'firmware.sh'. This patch ensures that
> either the .agent or the .sh gets installed.
> ---
>  modules.d/95udev-rules/install |    5 +++--
>  1 files changed, 3 insertions(+), 2 deletions(-)
> 
> diff --git a/modules.d/95udev-rules/install
> b/modules.d/95udev-rules/install index b903a41..287cc03 100755
> --- a/modules.d/95udev-rules/install
> +++ b/modules.d/95udev-rules/install
> @@ -15,7 +15,9 @@ inst_rules "$moddir/01-ignore.rules"
> 
>  # for firmware loading
>  inst_rules 50-firmware.rules
> -dracut_install /lib/udev/firmware.sh

Your patch seems to be against old codebase. This has changed in current 
GIT (and 004 actually) already to account for binary /lib/udev/firmware 
shipped with new udev.

> +for i in firmware.sh firmware.agent hotplug.functions ; do

If you redo the patch please do not forget about /lib/udev/firmware too.

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

Re: [PATCH] udev: install distro specific firmware handler

[Seewer Philippe]

Andrey Borzenkov wrote:
> On Friday 26 of February 2010 17:39:29 Philippe Seewer wrote:
>> Debian Unstable still calls its firmware handling script
>> 'firmware.agent' instead of 'firmware.sh'. This patch ensures that
>> either the .agent or the .sh gets installed.
>> ---
>>  modules.d/95udev-rules/install |    5 +++--
>>  1 files changed, 3 insertions(+), 2 deletions(-)
>>
>> diff --git a/modules.d/95udev-rules/install
>> b/modules.d/95udev-rules/install index b903a41..287cc03 100755
>> --- a/modules.d/95udev-rules/install
>> +++ b/modules.d/95udev-rules/install
>> @@ -15,7 +15,9 @@ inst_rules "$moddir/01-ignore.rules"
>>
>>  # for firmware loading
>>  inst_rules 50-firmware.rules
>> -dracut_install /lib/udev/firmware.sh
> 
> Your patch seems to be against old codebase. This has changed in current 
> GIT (and 004 actually) already to account for binary /lib/udev/firmware 
> shipped with new udev.

Now I'm confused... according to git's history there's only been two 
changes to 95udev-rules/install in the last 4-5 months.

Re: [PATCH] udev: install distro specific firmware handler

[Andrey Borzenkov]

[-- Attachment #1: Type: Text/Plain, Size: 1322 bytes --]

On Friday 26 of February 2010 18:41:22 Seewer Philippe wrote:
> Andrey Borzenkov wrote:
> > On Friday 26 of February 2010 17:39:29 Philippe Seewer wrote:
> >> Debian Unstable still calls its firmware handling script
> >> 'firmware.agent' instead of 'firmware.sh'. This patch ensures that
> >> either the .agent or the .sh gets installed.
> >> ---
> >> 
> >>  modules.d/95udev-rules/install |    5 +++--
> >>  1 files changed, 3 insertions(+), 2 deletions(-)
> >> 
> >> diff --git a/modules.d/95udev-rules/install
> >> b/modules.d/95udev-rules/install index b903a41..287cc03 100755
> >> --- a/modules.d/95udev-rules/install
> >> +++ b/modules.d/95udev-rules/install
> >> @@ -15,7 +15,9 @@ inst_rules "$moddir/01-ignore.rules"
> >> 
> >>  # for firmware loading
> >>  inst_rules 50-firmware.rules
> >> 
> >> -dracut_install /lib/udev/firmware.sh
> > 
> > Your patch seems to be against old codebase. This has changed in
> > current GIT (and 004 actually) already to account for binary
> > /lib/udev/firmware shipped with new udev.
> 
> Now I'm confused... according to git's history there's only been two
> changes to 95udev-rules/install in the last 4-5 months.
>

Oh, sorry - I was sure it was applied but it is not.

Could you please add /lib/udev/firmware to your patch then? Thank you!

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

Re: [PATCH] udev: install distro specific firmware handler

[Harald Hoyer]

On 02/26/2010 03:39 PM, Philippe Seewer wrote:
> Debian Unstable still calls its firmware handling script
> 'firmware.agent' instead of 'firmware.sh'. This patch ensures that
> either the .agent or the .sh gets installed.
> ---
>   modules.d/95udev-rules/install |    5 +++--
>   1 files changed, 3 insertions(+), 2 deletions(-)
>
> diff --git a/modules.d/95udev-rules/install b/modules.d/95udev-rules/install
> index b903a41..287cc03 100755
> --- a/modules.d/95udev-rules/install
> +++ b/modules.d/95udev-rules/install
> @@ -15,7 +15,9 @@ inst_rules "$moddir/01-ignore.rules"
>
>   # for firmware loading
>   inst_rules 50-firmware.rules
> -dracut_install /lib/udev/firmware.sh
> +for i in firmware.sh firmware.agent hotplug.functions ; do
> +    [ -e /lib/udev/$i ]&&  dracut_install /lib/udev/$i
> +done
>   dracut_install cat uname
>
>   if [ ! -x /lib/udev/vol_id ]; then
> @@ -31,7 +33,6 @@ ata_id \
>   cdrom_id \
>   create_floppy_devices \
>   edd_id \
> -firmware.sh \
>   fw_unit_symlinks.sh \
>   hid2hci \
>   path_id \

pushed