[PATCH] more udev-016/extras/multipath

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

diff --git a/extras/ide-devfs.sh b/extras/ide-devfs.sh
index ab194b01e65274c595d1164ac0482a6b69c9220d..1cf6f9c9e463aaf3d43be8f2a177aeb05e1098c1 100644 (file)
--- 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]\.}"
@@ -18,7 +18,7 @@ get_dev_number() {
        local x=
        local num=0
        local MEDIA=
-       local DRIVE="${1%[0-9]*}"
+       local DRIVE="${1%%[0-9]*}"
 
        for x in /proc/ide/*/media; do
                if [ -e "${x}" ]; then
@@ -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