[PATCH] udev - small script optimization

[PATCH] udev - small script optimization

[Kay Sievers]

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

Optimize the scripts reflecting the now more powerful rule logic,
cause we can combine all known fields now in any order:

  The ide-devfs.sh is only executed if the kernel name matches with 'hd*':

    BUS="ide", KERNEL="hd*", PROGRAM="/etc/udev/ide-devfs.sh %k %b %n", NAME="%k", SYMLINK="%1c %2c"

  The name_cdrom.pl is only executed for ide and scsi devices, but not for a partition.
  It exits with nonzero to skip the rule if the CD is not found:

    KERNEL="[hs]d[a-z]", PROGRAM="name_cdrom.pl %M %m", NAME="%1c", SYMLINK="cdrom"


I'm happy for today, this was my last patch. :)

Kay

[-- Attachment #2: 06-script-optimization.diff --]
[-- Type: text/plain, Size: 3023 bytes --]

diff -Nru a/extras/ide-devfs.sh b/extras/ide-devfs.sh
--- a/extras/ide-devfs.sh	Tue Jan 13 04:38:46 2004
+++ b/extras/ide-devfs.sh	Tue Jan 13 04:38:46 2004
@@ -2,7 +2,7 @@
 
 # udev external PROGRAM script
 # return devfs-names for ide-devices
-# BUS="ide", PROGRAM="/etc/udev/ide-devfs.sh %k %b %n", RESULT="hd*", NAME="%1c", SYMLINK="%2c %3c"
+# BUS="ide", KERNEL="hd*", PROGRAM="/etc/udev/ide-devfs.sh %k %b %n", NAME="%k", SYMLINK="%1c %2c"
 
 HOST="${2%\.[0-9]}"
 TARGET="${2#[0-9]\.}"
@@ -38,10 +38,10 @@
 if [ -z "$3" ]; then
 	MEDIA=`cat /proc/ide/${1}/media`
 	if [ "${MEDIA}" = "cdrom" ]; then
-		echo $1 ide/host${HOST}/bus${BUS}/target${TARGET}/lun0/cd cdroms/cdrom`get_dev_number $1 cdrom`
+		echo ide/host${HOST}/bus${BUS}/target${TARGET}/lun0/cd cdroms/cdrom`get_dev_number $1 cdrom`
 	elif [ "${MEDIA}" = "disk" ]; then
-		echo $1 ide/host${HOST}/bus${BUS}/target${TARGET}/lun0/disc discs/disc`get_dev_number $1 disk`/disc
+		echo ide/host${HOST}/bus${BUS}/target${TARGET}/lun0/disc discs/disc`get_dev_number $1 disk`/disc
 	fi
 else
-	echo $1 ide/host${HOST}/bus${BUS}/target${TARGET}/lun0/part$3 discs/disc`get_dev_number $1 disk`/part$3
+	echo ide/host${HOST}/bus${BUS}/target${TARGET}/lun0/part$3 discs/disc`get_dev_number $1 disk`/part$3
 fi
diff -Nru a/extras/name_cdrom.pl b/extras/name_cdrom.pl
--- a/extras/name_cdrom.pl	Tue Jan 13 04:38:46 2004
+++ b/extras/name_cdrom.pl	Tue Jan 13 04:38:46 2004
@@ -2,19 +2,17 @@
 
 # a horribly funny script that shows how flexible udev can really be
 # This is to be executed by udev with the following rules:
-# BUS="ide", PROGRAM="name_cdrom.pl %M %m", PROGRAM="good*", NAME="%2c", SYMLINK="cdrom"
-# BUS="scsi", PROGRAM="name_cdrom.pl %M %m", PROGRAM="good*", NAME="%2c", SYMLINK="cdrom"
-#
-# The scsi rule catches USB cdroms and ide-scsi devices.
-#
+# KERNEL="[hs]d[a-z]", PROGRAM="name_cdrom.pl %M %m", NAME="%1c", SYMLINK="cdrom"
 
-use CDDB_get qw( get_cddb );
+use strict;
+use warnings;
 
-my %config;
+use CDDB_get qw( get_cddb );
 
-$dev_node = "/tmp/cd_foo";
+my $dev_node = "/tmp/cd_foo";
 
 # following variables just need to be declared if different from defaults
+my %config;
 $config{CDDB_HOST}="freedb.freedb.org";		# set cddb host
 $config{CDDB_PORT}=8880;			# set cddb port
 $config{CDDB_MODE}="cddb";			# set cddb mode: cddb or http
@@ -23,8 +21,8 @@
 # No user interaction, this is a automated script!
 $config{input}=0;
 
-$major = $ARGV[0];
-$minor = $ARGV[1];
+my $major = $ARGV[0];
+my $minor = $ARGV[1];
 
 # create our temp device node to read the cd info from
 unlink($dev_node);
@@ -38,11 +36,11 @@
 # remove the dev node we just created
 unlink($dev_node);
 
-# print out our cd name if we have found it
-unless(defined $cd{title}) {
-	print"bad unknown cdrom\n";
-} else {
+# print out our cd name if we have found it or skip rule by nonzero exit
+if (defined $cd{title}) {
 	$cd{artist} =~ s/ /_/g;
 	$cd{title} =~ s/ /_/g;
-	print "good $cd{artist}-$cd{title}\n";
+	print "$cd{artist}-$cd{title}\n";
+} else {
+	exit -1;
 }

Re: [PATCH] udev - small script optimization

[Greg KH]

On Tue, Jan 13, 2004 at 04:50:15AM +0100, Kay Sievers wrote:
> Optimize the scripts reflecting the now more powerful rule logic,
> cause we can combine all known fields now in any order:
> 
>   The ide-devfs.sh is only executed if the kernel name matches with 'hd*':
> 
>     BUS="ide", KERNEL="hd*", PROGRAM="/etc/udev/ide-devfs.sh %k %b %n", NAME="%k", SYMLINK="%1c %2c"
> 
>   The name_cdrom.pl is only executed for ide and scsi devices, but not for a partition.
>   It exits with nonzero to skip the rule if the CD is not found:
> 
>     KERNEL="[hs]d[a-z]", PROGRAM="name_cdrom.pl %M %m", NAME="%1c", SYMLINK="cdrom"
> 
> 
> I'm happy for today, this was my last patch. :)

Heh, nice work.  Applied, thanks.

greg k-h


-------------------------------------------------------
This SF.net email is sponsored by: Perforce Software.
Perforce is the Fast Software Configuration Management System offering
advanced branching capabilities and atomic changes on 50+ platforms.
Free Eval! http://www.perforce.com/perforce/loadprog.html
_______________________________________________
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

Re: [PATCH] udev - small script optimization

[Martin Hicks]

On Tue, Jan 13, 2004 at 04:50:15AM +0100, Kay Sievers wrote:
> 
>   The name_cdrom.pl is only executed for ide and scsi devices, but not for a partition.
>   It exits with nonzero to skip the rule if the CD is not found:
> 
>     KERNEL="[hs]d[a-z]", PROGRAM="name_cdrom.pl %M %m", NAME="%1c", SYMLINK="cdrom"
> 

This won't work on machines with lots of SCSI targets (I suppose
IDE could have the same problem although it's much less likely)

I'm pretty sure that we don't support the '+' metacharacter, but what
would really work is:

KERNEL="[hs]d[a-z]+"

because after sdz we go on to sdaa.  I'm not really complaining, because
it seems unlikely that you would find machines with cdroms after the
first 26 SCSI targets.  I'm just pointing out that this rule isn't
exactly correct.

mh

-- 
Martin Hicks || mort@bork.org || PGP/GnuPG: 0x4C7F2BEE


-------------------------------------------------------
This SF.net email is sponsored by: Perforce Software.
Perforce is the Fast Software Configuration Management System offering
advanced branching capabilities and atomic changes on 50+ platforms.
Free Eval! http://www.perforce.com/perforce/loadprog.html
_______________________________________________
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