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] Allow GROUP to have modifiers in it
[elogind.git]
/
extras
/
ide-devfs.sh
diff --git
a/extras/ide-devfs.sh
b/extras/ide-devfs.sh
index 4d021c5e8723ccd18554c127b7c91a3ed107e5f2..580a751abe75092d14f04f276c378943e6320e56 100644
(file)
--- a/
extras/ide-devfs.sh
+++ b/
extras/ide-devfs.sh
@@
-15,15
+15,13
@@
else
fi
get_dev_number() {
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
for x in /proc/ide/*/media; do
if [ -e "${x}" ]; then
- MEDIA=`cat ${x}`
- if [ "${MEDIA}" = "$2" ]; then
+
l
MEDIA=`cat ${x}`
+ if [ "${
l
MEDIA}" = "$2" ]; then
num=$((${num} + 1))
fi
if [ "${x}" = "/proc/ide/${DRIVE}/media" ]; then
num=$((${num} + 1))
fi
if [ "${x}" = "/proc/ide/${DRIVE}/media" ]; then
@@
-35,14
+33,14
@@
get_dev_number() {
echo $((${num} - 1))
}
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
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
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
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
fi
else
echo ide/host${HOST}/bus${BUS}/target${TARGET}/lun0/part$3 discs/disc`get_dev_number $1 disk`/part$3