summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGreg KH <greg@press.(none)>2005-04-26 23:10:15 -0700
committerGreg KH <gregkh@suse.de>2005-04-26 23:10:15 -0700
commit5e7d9f4060f0d1f11048c8735aa5d7ef6a4932e8 (patch)
tree248ab29aaab8317750ee23ef1ee1be3e14a02882
parente0a17b749f00ef42dda0efe71f7f26637c4ca9a9 (diff)
more merge fixups
-rw-r--r--etc/udev/udev.rules.gentoo2
-rw-r--r--extras/ide-devfs.sh6
2 files changed, 4 insertions, 4 deletions
diff --git a/etc/udev/udev.rules.gentoo b/etc/udev/udev.rules.gentoo
index 64e020f83e..6a53e88d9d 100644
--- a/etc/udev/udev.rules.gentoo
+++ b/etc/udev/udev.rules.gentoo
@@ -19,7 +19,7 @@ BUS="scsi", KERNEL="scd[a-z]", PROGRAM="/etc/udev/scripts/cdsymlinks.sh %k", SYM
# devfs-names for ide-devices (uncomment only one)
# /dev/ide/.../{disc,cd} and /dev/{cdroms,discs}/* type names
-BUS="ide", KERNEL="hd*", PROGRAM="/etc/udev/scripts/ide-devfs.sh %k %b %n", NAME="%k", SYMLINK="%c{1} %c{2}"
+BUS="ide", KERNEL="hd*", PROGRAM="/etc/udev/scripts/ide-devfs.sh %k %b %n", NAME="%k", SYMLINK="%c{1} %c{2}", GROUP="%c{3}"
# dri devices
KERNEL="card*", NAME="dri/card%n"
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