[PATCH] Exit, if udevtest cannot open the device (segfault).

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

diff --git a/extras/ide-devfs.sh b/extras/ide-devfs.sh
index 22d09d7a5ac0efc8768504b9b874325c8d4f05db..4f202594801f3354410189b978a301eba47033b3 100644 (file)
--- a/extras/ide-devfs.sh
+++ b/extras/ide-devfs.sh
@@ -15,15 +15,13 @@ else
 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
+                       lMEDIA=`cat ${x}`
+                       if [ "${lMEDIA}" = "$2" ]; then
                                num=$((${num} + 1))
                        fi
                        if [ "${x}" = "/proc/ide/${DRIVE}/media" ]; then
@@ -35,10 +33,12 @@ get_dev_number() {
        echo $((${num} - 1))
 }
 
-if [ -z "$3" -a -f /proc/ide/${1}/media ]; 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`
+       elif [ "${MEDIA}" = "floppy" ]; then
+               echo ide/host${HOST}/bus${BUS}/target${TARGET}/lun0/disc floppies/floppy`get_dev_number $1 floppy`/disc
        elif [ "${MEDIA}" = "disk" ]; then
                echo ide/host${HOST}/bus${BUS}/target${TARGET}/lun0/disc discs/disc`get_dev_number $1 disk`/disc
        fi