mirror of
https://github.com/systemd/systemd-stable.git
synced 2024-10-30 23:21:08 +03:00
more merge fixups
This commit is contained in:
parent
e0a17b749f
commit
5e7d9f4060
@ -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"
|
||||
|
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user