diff options
| -rw-r--r-- | extras/ide-devfs.sh | 8 | ||||
| -rw-r--r-- | extras/name_cdrom.pl | 28 |
2 files changed, 17 insertions, 19 deletions
diff --git a/extras/ide-devfs.sh b/extras/ide-devfs.sh index ab194b01e6..8648f6c0c0 100644 --- a/extras/ide-devfs.sh +++ b/extras/ide-devfs.sh @@ -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 @@ get_dev_number() { 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 --git a/extras/name_cdrom.pl b/extras/name_cdrom.pl index e522c9fda8..3a4772e6d9 100644 --- a/extras/name_cdrom.pl +++ b/extras/name_cdrom.pl @@ -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 @@ $config{CD_DEVICE}="$dev_node"; # set cd device # 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 @@ my %cd=get_cddb(\%config); # 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; } |