X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=extras%2Fname_cdrom.pl;h=28d2d29a3decf920debc4d3e545f6ba837a0aeb7;hp=7a14e866a623884e246c3cef8982caace4978f2f;hb=f05da2ae00de9fedaabb59dbf9a18b63175c5d40;hpb=d6e86b3752dc2603c5811b153a1db0143cac5721

diff --git a/extras/name_cdrom.pl b/extras/name_cdrom.pl
old mode 100644
new mode 100755
index 7a14e866a..28d2d29a3
--- a/extras/name_cdrom.pl
+++ b/extras/name_cdrom.pl
@@ -1,48 +1,31 @@
 #!/usr/bin/perl
 
-# a horribly funny script that shows how flexible udev can really be
-# This is to be executed by udev with the following rules:
-# CALLOUT, BUS="ide", PROGRAM="name_cdrom.pl %M %m", ID="good*", NAME="%2c", SYMLINK="cdrom"
-# CALLOUT, BUS="scsi", PROGRAM="name_cdrom.pl %M %m", ID="good*", NAME="%2c", SYMLINK="cdrom"
-#
-# The scsi rule catches USB cdroms and ide-scsi devices.
-#
+# Horrible but funny script that shows how flexible udev can really be
+# This is to be executed by udev with the following rule:
+#   KERNEL="hd*[!0-9]|sr*", PROGRAM="name_cdrom.pl $tempnode", SYMLINK+="%c"
 
-use CDDB_get qw( get_cddb );
+use strict;
+use warnings;
 
-my %config;
-
-$dev_node = "/tmp/cd_foo";
+use CDDB_get qw(get_cddb);
 
 # following variables just need to be declared if different from defaults
-$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
-$config{CD_DEVICE}="$dev_node";			# set cd device
-
-# No user interaction, this is a automated script!
-$config{input}=0;
+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
+$config{'CD_DEVICE'} = $ARGV[0];		# set cd device
+$config{'input'} = 0; 				# no user interaction
 
-$major = $ARGV[0];
-$minor = $ARGV[1];
+my %cd = get_cddb(\%config);
 
-# create our temp device node to read the cd info from
-unlink($dev_node);
-if (system("mknod $dev_node b $major $minor")) {
-       die "bad mknod failed";
+if (!defined $cd{title}) {
+	exit 1;
 }
 
-# get it on
-my %cd=get_cddb(\%config);
-
-# remove the dev node we just created
-unlink($dev_node);
+# print out our cd name
+$cd{artist} =~ s/ /_/g;
+$cd{title} =~ s/ /_/g;
+print "$cd{artist}-$cd{title}\n";
 
-# print out our cd name if we have found it
-unless(defined $cd{title}) {
-	print"bad unknown cdrom\n";
-} else {
-	$cd{artist} =~ s/ /_/g;
-	$cd{title} =~ s/ /_/g;
-	print "good $cd{artist}-$cd{title}\n";
-}
+exit 0;