chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[PATCH] DEVNODE -> DEVNAME transition fixes
[elogind.git]
/
extras
/
ide-devfs.sh
diff --git
a/extras/ide-devfs.sh
b/extras/ide-devfs.sh
index db96b5d2996a6ca707c6899d44c08f15b255774b..22d09d7a5ac0efc8768504b9b874325c8d4f05db 100644
(file)
--- a/
extras/ide-devfs.sh
+++ b/
extras/ide-devfs.sh
@@
-1,14
+1,14
@@
#!/bin/sh
#!/bin/sh
-# udev
CALLOUT
script
+# udev
external PROGRAM
script
# return devfs-names for ide-devices
# 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]\.}"
if [ -z "${HOST#[13579]}" ]; then
HOST="${2%\.[0-9]}"
TARGET="${2#[0-9]\.}"
if [ -z "${HOST#[13579]}" ]; then
- HOST=
`expr ${HOST} - 1`
+ HOST=
$((${HOST} - 1))
BUS="1"
else
BUS="0"
BUS="1"
else
BUS="0"
@@
-18,13
+18,13
@@
get_dev_number() {
local x=
local num=0
local MEDIA=
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
MEDIA=`cat ${x}`
if [ "${MEDIA}" = "$2" ]; then
for x in /proc/ide/*/media; do
if [ -e "${x}" ]; then
MEDIA=`cat ${x}`
if [ "${MEDIA}" = "$2" ]; then
- num=
`expr ${num} + 1`
+ num=
$((${num} + 1))
fi
if [ "${x}" = "/proc/ide/${DRIVE}/media" ]; then
break
fi
if [ "${x}" = "/proc/ide/${DRIVE}/media" ]; then
break
@@
-32,16
+32,16
@@
get_dev_number() {
fi
done
fi
done
- echo
`expr ${num} - 1`
+ echo
$((${num} - 1))
}
}
-if [ -z "$3" ]; then
+if [ -z "$3"
-a -f /proc/ide/${1}/media
]; then
MEDIA=`cat /proc/ide/${1}/media`
if [ "${MEDIA}" = "cdrom" ]; 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
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
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
fi