warn about %e, MODALIAS, $modalias

[elogind.git] / extras / ide-devfs.sh

diff --git a/extras/ide-devfs.sh b/extras/ide-devfs.sh
index 8648f6c0c06d7c97678cef10f9bc7993394a693f..d4c05b53426dba333691dbb211aa0c338d683331 100644 (file)
--- a/extras/ide-devfs.sh
+++ b/extras/ide-devfs.sh
@@ -2,29 +2,27 @@
 
 # udev external PROGRAM script
 # return devfs-names for ide-devices
-# BUS="ide", KERNEL="hd*", PROGRAM="/etc/udev/ide-devfs.sh %k %b %n", NAME="%k", SYMLINK="%1c %2c"
+# BUS="ide", KERNEL="hd*", PROGRAM="/etc/udev/ide-devfs.sh %k %b %n", NAME="%k", SYMLINK="%c{1} %c{2}", GROUP="%c{3}"
 
 HOST="${2%\.[0-9]}"
 TARGET="${2#[0-9]\.}"
 
 if [ -z "${HOST#[13579]}" ]; then
-       HOST=`expr ${HOST} - 1`
+       HOST=$((${HOST} - 1))
        BUS="1"
 else
        BUS="0"
 fi
 
 get_dev_number() {
-       local x=
-       local num=0
-       local MEDIA=
-       local DRIVE="${1%[0-9]*}"
+       num=0
+       DRIVE="${1%%[0-9]*}"
 
        for x in /proc/ide/*/media; do
                if [ -e "${x}" ]; then
-                       MEDIA=`cat ${x}`
-                       if [ "${MEDIA}" = "$2" ]; then
-                               num=`expr ${num} + 1`
+                       lMEDIA=`cat ${x}`
+                       if [ "${lMEDIA}" = "$2" ]; then
+                               num=$((${num} + 1))
                        fi
                        if [ "${x}" = "/proc/ide/${DRIVE}/media" ]; then
                                break
@@ -32,15 +30,17 @@ get_dev_number() {
                fi
        done
        
-       echo `expr ${num} - 1`
+       echo $((${num} - 1))
 }
 
-if [ -z "$3" ]; then
+if [ -z "$3" ] && [ -f /proc/ide/${1}/media ]; then
        MEDIA=`cat /proc/ide/${1}/media`
        if [ "${MEDIA}" = "cdrom" ]; then
-               echo 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` ${MEDIA}
+       elif [ "${MEDIA}" = "floppy" ]; then
+               echo ide/host${HOST}/bus${BUS}/target${TARGET}/lun0/disc floppies/floppy`get_dev_number $1 floppy`/disc ${MEDIA}
        elif [ "${MEDIA}" = "disk" ]; then
-               echo 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 ${MEDIA}
        fi
 else
        echo ide/host${HOST}/bus${BUS}/target${TARGET}/lun0/part$3 discs/disc`get_dev_number $1 disk`/part$3