From: Greg Kroah-Hartman <gregkh@suse.de>
Date: Wed, 6 Jul 2005 20:15:23 +0000 (-0700)
Subject: fix cdrom symlink problem in gentoo rules
X-Git-Tag: 061~2
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=0cc976eeaf6370490e1f40faf7926180cfeb85fe;hp=040e26dc99b84a122ddc4a5bee75f4772766078c;ds=sidebyside

fix cdrom symlink problem in gentoo rules
---

diff --git a/etc/udev/gentoo/udev.rules b/etc/udev/gentoo/udev.rules
index de74c088f..a0e17359b 100644
--- a/etc/udev/gentoo/udev.rules
+++ b/etc/udev/gentoo/udev.rules
@@ -16,13 +16,13 @@
 SUBSYSTEM=="block", GROUP="disk"
 
 # cdrom symlinks and other good cdrom naming
-BUS=="ide",  KERNEL="hd[a-z]", PROGRAM="/etc/udev/scripts/cdsymlinks.sh %k", SYMLINK="%c{1} %c{2} %c{3} %c{4} %c{5} %c{6}"
-BUS=="scsi", KERNEL="sr[0-9]*", PROGRAM="/etc/udev/scripts/cdsymlinks.sh %k", SYMLINK="%c{1} %c{2} %c{3} %c{4} %c{5} %c{6}"
-BUS=="scsi", KERNEL="scd[a-z]", PROGRAM="/etc/udev/scripts/cdsymlinks.sh %k", SYMLINK="%c{1} %c{2} %c{3} %c{4} %c{5} %c{6}"
+BUS=="ide",  KERNEL="hd[a-z]", PROGRAM="/etc/udev/scripts/cdsymlinks.sh %k", SYMLINK+="%c{1} %c{2} %c{3} %c{4} %c{5} %c{6}"
+BUS=="scsi", KERNEL="sr[0-9]*", PROGRAM="/etc/udev/scripts/cdsymlinks.sh %k", SYMLINK+="%c{1} %c{2} %c{3} %c{4} %c{5} %c{6}"
+BUS=="scsi", KERNEL="scd[a-z]", PROGRAM="/etc/udev/scripts/cdsymlinks.sh %k", SYMLINK+="%c{1} %c{2} %c{3} %c{4} %c{5} %c{6}"
 
 # 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}", GROUP="%c{3}"
+BUS=="ide", KERNEL="hd*", PROGRAM="/etc/udev/scripts/ide-devfs.sh %k %b %n", NAME="%k", SYMLINK+="%c{1} %c{2}", GROUP="%c{3}"
 
 # disk devices
 KERNEL=="sd*",		NAME="%k", GROUP="disk"
@@ -139,8 +139,8 @@ KERNEL=="sequencer[0-9]*",	NAME="sound/%k", SYMLINK+="%k", GROUP="audio"
 # tty devices
 KERNEL=="console",	NAME="%k", GROUP="tty", MODE="0600"
 KERNEL=="tty",		NAME="%k", GROUP="tty", MODE="0666"
-KERNEL=="tty[0-9]*",	NAME="vc/%n", SYMLINK="%k", GROUP="tty"
-KERNEL=="ttyS[0-9]*",	NAME="tts/%n", SYMLINK="%k", GROUP="tty"
+KERNEL=="tty[0-9]*",	NAME="vc/%n", SYMLINK+="%k", GROUP="tty"
+KERNEL=="ttyS[0-9]*",	NAME="tts/%n", SYMLINK+="%k", GROUP="tty"
 KERNEL=="ttyUSB[0-9]*",	NAME="tts/USB%n", GROUP="tty", MODE="0660"
 KERNEL=="ippp0",	NAME="%k", GROUP="tty"
 KERNEL=="isdn*"		NAME="%k", GROUP="tty"
@@ -249,9 +249,9 @@ KERNEL=="dv1394*", NAME="dv1394/%n", GROUP="video"
 KERNEL=="video1394*", NAME="video1394/%n", GROUP="video"
 
 # be backward compatible for a while with the /etc/dev.d and /etc/hotplug.d/ systems
-# run hotplug.d/ stuff only if we came from a hotplug event, not for udevstart
+# run /etc/hotplug.d/ stuff only if we came from a hotplug event, not for udevstart
 ENV{UDEVD_EVENT}=="1", RUN+="/sbin/udev_run_hotplugd"
 
-# always run dev.d/ stuff for now.
+# always run /etc/dev.d/ stuff for now.
 RUN+="/sbin/udev_run_devd"