X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=extras%2Fide-devfs.sh;h=d4c05b53426dba333691dbb211aa0c338d683331;hp=4d021c5e8723ccd18554c127b7c91a3ed107e5f2;hb=fc049858394318dab8ec729cb49cd6cfd49f350d;hpb=af5b5178fa9cb8b75d00fb364f266c3919f12cd2

diff --git a/extras/ide-devfs.sh b/extras/ide-devfs.sh
index 4d021c5e8..d4c05b534 100644
--- 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", KERNEL="hd*", PROGRAM="/etc/udev/ide-devfs.sh %k %b %n", NAME="%k", SYMLINK="%c{1} %c{2}"
+# 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]\.}"
@@ -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,14 +33,14 @@ 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`
+		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
+		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