summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorkay.sievers@vrfy.org <kay.sievers@vrfy.org>2003-12-30 01:08:00 -0800
committerGreg KH <gregkh@suse.de>2005-04-26 21:13:12 -0700
commitbbc1c767b21e17a51dbe1b5edb2c379c5fce7e95 (patch)
tree2ba86b1af0c231bebe152251c0ddc99cd1f96af9
parent647c8fc43eb8f3d92ed7142f7c235f3db02f4cfa (diff)
[PATCH] ide-devfs.sh update
Attached is a patch for ide-devfs.sh, The script is merged with the one from Martin Schlemmer, and cleaned up by him, to create both types of symlinks with one single rule: CALLOUT, BUS="ide", PROGRAM="/etc/udev/ide-devfs.sh %k %b %n", ID="hd*", NAME="%1c", SYMLINK="%2c %3c" /udev/ |-- cdroms | `-- cdrom0 -> ../hdc |-- discs | |-- disc0 | | |-- disc -> ../../hda | | |-- part1 -> ../../hda1 | | |-- part2 -> ../../hda2 | | `-- part4 -> ../../hda4 | |-- disc1 | | |-- disc -> ../../hdb | | `-- part1 -> ../../hdb1 | `-- disc2 | |-- disc -> ../../hde | `-- part1 -> ../../hde1 |-- hda |-- hda1 |-- hda2 |-- hda4 |-- hdb |-- hdb1 |-- hdc |-- hde |-- hde1 `-- ide |-- host0 | |-- bus0 | | |-- target0 | | | `-- lun0 | | | |-- disc -> ../../../../../hda | | | |-- part1 -> ../../../../../hda1 | | | |-- part2 -> ../../../../../hda2 | | | `-- part4 -> ../../../../../hda4 | | `-- target1 | | `-- lun0 | | |-- disc -> ../../../../../hdb | | `-- part1 -> ../../../../../hdb1 | `-- bus1 | `-- target0 | `-- lun0 | `-- cd -> ../../../../../hdc `-- host2 `-- bus0 `-- target0 `-- lun0 |-- disc -> ../../../../../hde `-- part1 -> ../../../../../hde1
-rw-r--r--extras/ide-devfs.sh44
1 files changed, 32 insertions, 12 deletions
diff --git a/extras/ide-devfs.sh b/extras/ide-devfs.sh
index 3409c407eb..db96b5d299 100644
--- a/extras/ide-devfs.sh
+++ b/extras/ide-devfs.sh
@@ -2,26 +2,46 @@
# udev CALLOUT 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"
+# CALLOUT, BUS="ide", PROGRAM="/etc/udev/ide-devfs.sh %k %b %n", ID="hd*", NAME="%1c", SYMLINK="%2c %3c"
-HOST=${2%\.[0-9]}
-TARGET=${2#[0-9]\.}
+HOST="${2%\.[0-9]}"
+TARGET="${2#[0-9]\.}"
-if [ -z ${HOST#[13579]} ]; then
- HOST=`expr $HOST - 1`
+if [ -z "${HOST#[13579]}" ]; then
+ HOST=`expr ${HOST} - 1`
BUS="1"
else
BUS="0"
fi
+get_dev_number() {
+ local x=
+ local num=0
+ local MEDIA=
+ local 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`
+ fi
+ if [ "${x}" = "/proc/ide/${DRIVE}/media" ]; then
+ break
+ fi
+ fi
+ done
+
+ echo `expr ${num} - 1`
+}
+
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
- elif [ "$MEDIA" = "disk" ]; then
- echo $1 ide/host$HOST/bus$BUS/target$TARGET/lun0/disc
+ 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`
+ elif [ "${MEDIA}" = "disk" ]; then
+ echo $1 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
+ echo $1 ide/host${HOST}/bus${BUS}/target${TARGET}/lun0/part$3 discs/disc`get_dev_number $1 disk`/part$3
fi
-