diff options
| author | Greg KH <greg@press.(none)> | 2005-04-26 23:10:15 -0700 |
|---|---|---|
| committer | Greg KH <gregkh@suse.de> | 2005-04-26 23:10:15 -0700 |
| commit | 5e7d9f4060f0d1f11048c8735aa5d7ef6a4932e8 (patch) | |
| tree | 248ab29aaab8317750ee23ef1ee1be3e14a02882 /extras | |
| parent | e0a17b749f00ef42dda0efe71f7f26637c4ca9a9 (diff) | |
more merge fixups
Diffstat (limited to 'extras')
| -rw-r--r-- | extras/ide-devfs.sh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/extras/ide-devfs.sh b/extras/ide-devfs.sh index 4f20259480..580a751abe 100644 --- a/extras/ide-devfs.sh +++ b/extras/ide-devfs.sh @@ -36,11 +36,11 @@ get_dev_number() { 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 |