Changeset df6532c for udev

Timestamp:

May 14, 2006, 5:41:04 PM (19 years ago)

Author:

Jim Gifford <clfs@…>

Branches:

clfs-1.2, clfs-2.1, clfs-3.0.0-systemd, clfs-3.0.0-sysvinit, master, systemd, sysvinit

Children:

4631c1c

Parents:

4dd194e2

Message:

r3505@server: jim | 2006-05-14 17:40:44 -0700
Enhancements to the cdrom symlinks add on

Location:

udev

Files:

• 35-helper.rules (modified) (1 diff)
• cdsymlink_helper.sh (modified) (2 diffs)

udev/35-helper.rules

@@ -24 +24 @@
 BUS=="scsi",    KERNEL=="sg[0-9]*", ACTION=="add", DRIVER=="sr", GROUP="cdrom"
 
-BUS=="ide",     ENV{ID_CDROM}=="?*", PROGRAM="cdsymlink_helper.sh %k", SYMLINK+="cdrom%c", GROUP="cdrom"
-BUS=="ide",     ENV{ID_CDROM_CD_R}=="?*", PROGRAM="cdsymlink_helper.sh %k", SYMLINK+="cdr%c"
-BUS=="ide",     ENV{ID_CDROM_CD_RW}=="?*", PROGRAM="cdsymlink_helper.sh %k", SYMLINK+="cdrw%c"
-BUS=="ide",     ENV{ID_CDROM_DVD}=="?*", PROGRAM="cdsymlink_helper.sh %k", SYMLINK+="dvd%c"
-BUS=="ide",     ENV{ID_CDROM_DVD_R}=="?*", PROGRAM="cdsymlink_helper.sh %k", SYMLINK+="dvdrw%c"
+BUS=="ide",     ENV{ID_CDROM}=="?*", PROGRAM="cdsymlink_helper.sh %k ide", SYMLINK+="cdrom%c"
+BUS=="ide",     ENV{ID_CDROM_CD_R}=="?*", PROGRAM="cdsymlink_helper.sh %k ide", SYMLINK+="cdr%c"
+BUS=="ide",     ENV{ID_CDROM_CD_RW}=="?*", PROGRAM="cdsymlink_helper.sh %k ide", SYMLINK+="cdrw%c"
+BUS=="ide",     ENV{ID_CDROM_DVD}=="?*", PROGRAM="cdsymlink_helper.sh %k ide", SYMLINK+="dvd%c"
+BUS=="ide",     ENV{ID_CDROM_DVD_R}=="?*", PROGRAM="cdsymlink_helper.sh %k ide", SYMLINK+="dvdrw%c"
 
-BUS=="scsi",    ENV{ID_CDROM}=="?*", SYMLINK+="cdrom%n", GROUP="cdrom"
-BUS=="scsi",    ENV{ID_CDROM_CD_R}=="?*", SYMLINK+="cdr%n"
-BUS=="scsi",    ENV{ID_CDROM_CD_RW}=="?*", SYMLINK+="cdrw%n"
-BUS=="scsi",    ENV{ID_CDROM_DVD}=="?*", SYMLINK+="dvd%n"
-BUS=="scsi",    ENV{ID_CDROM_DVD_R}=="?*", SYMLINK+="dvdrw%n"
+BUS=="scsi",    ENV{ID_CDROM}=="?*", PROGRAM="cdsymlink_helper.sh %k scsi", SYMLINK+="cdrom%c"
+BUS=="scsi",    ENV{ID_CDROM_CD_R}=="?*", PROGRAM="cdsymlink_helper.sh %k scsi", SYMLINK+="cdr%c"
+BUS=="scsi",    ENV{ID_CDROM_CD_RW}=="?*", PROGRAM="cdsymlink_helper.sh %k scsi", SYMLINK+="cdrw%c"
+BUS=="scsi",    ENV{ID_CDROM_DVD}=="?*", PROGRAM="cdsymlink_helper.sh %k scsi", SYMLINK+="dvd%c"
+BUS=="scsi",    ENV{ID_CDROM_DVD_R}=="?*", PROGRAM="cdsymlink_helper.sh %k scsi", SYMLINK+="dvdrw%c"
 
 # adds floppy devices

udev/cdsymlink_helper.sh

@@ -16 +16 @@
 
 KERN_NAME="$1"
+BUS="$2"
+test=0
 
 if [ "$KERN_NAME" = "" ]; then
@@ -22 +24 @@
 fi
 
-FILES="`ls /sys/bus/ide/drivers/ide-cdrom | grep 1.`"
-        for file in $FILES; do
-                TEST="`ls /sys/bus/ide/drivers/ide-cdrom/$file | grep -c $KERN_NAME`"
-                if [ "$TEST" = "1" ]; then
-                        link="`echo $file | cut -f2 -d.`"
-                        echo $link
-                fi
-        done
+if [ "$BUS" = "ide" ]; then
+        FILES="`ls /sys/bus/ide/drivers/ide-cdrom | grep '\.' `"
+                for file in $FILES; do
+                        TEST="`ls /sys/bus/ide/drivers/ide-cdrom/$file | grep -c $KERN_NAME`"
+                        if [ "$TEST" = "1" ]; then
+                                link="`echo $file | cut -f2 -d.`"
+                                while [ $test -lt 1 ] ; do
+                                        if [ -e /dev/cdrom$link ]; then
+                                                link=$[$link+1]
+                                        else
+                                                test=1
+                                                echo $link
+                                        fi
+                                done
+                        fi
+                done
+fi
+
+if [ "$BUS" = "scsi" ]; then
+        link=$KERN_NAME
+                while [ $test -lt 1 ] ; do
+                        if [ -e /dev/cdrom$link ]; then
+                                link=$[$link+1]
+                        else
+                                test=1
+                                echo $link
+                        fi
+                done
+fi
+