X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=extras%2Fide-devfs.sh;h=0a9369dff4aa17f74535616823a0d2e171550a0b;hb=88f09368b3dc2d17cf2ce1a4841e42a120a4dbb9;hp=57fb00b6766aae31b9953c7f7753576caa623a9d;hpb=e64280b8b30569ad6029e48f23d290e06a28d7ed;p=elogind.git

diff --git a/extras/ide-devfs.sh b/extras/ide-devfs.sh
index 57fb00b67..0a9369dff 100644
--- a/extras/ide-devfs.sh
+++ b/extras/ide-devfs.sh
@@ -1,8 +1,8 @@
 #!/bin/sh
 
-# udev CALLOUT script
+# udev external PROGRAM script
 # return devfs-names for ide-devices
-# CALLOUT, BUS="ide", PROGRAM="/etc/udev/ide-devfs.sh %k %b %n", ID="hd*", NAME="%1c", SYMLINK="%2c %3c"
+# BUS="ide", KERNEL="hd*", PROGRAM="/etc/udev/ide-devfs.sh %k %b %n", NAME="%k", SYMLINK="%c{1} %c{2}"
 
 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