[SM-Commit] PERFORCE change 79110 by Juuso Alasuutari for review

Perforce Review Daemon p4review at smee.org
Wed May 10 16:25:01 EDT 2006


Change 79110 by juuso_alasuutari at juuso_alasuutari-kamayuq on 2006/05/10 21:21:43

	Fixed usb printer node naming, added new rules, added new
	keywords to test

Affected files ...

... //sgl/grimoires/test/disk/udev/DETAILS#44 integrate
... //sgl/grimoires/test/disk/udev/HISTORY#66 integrate
... //sgl/grimoires/test/disk/udev/rules/50-default.rules#16 integrate

Differences ...

==== //sgl/grimoires/test/disk/udev/DETAILS#44 (xtext) ====

@@ -10,10 +10,10 @@
         WEB_SITE=http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html
          ENTERED=20030725
          UPDATED=20060107
-      PATCHLEVEL=9
+      PATCHLEVEL=10
             DOCS="ChangeLog COPYING FAQ README docs/* RELEASE-NOTES"
       LICENSE[0]=GPL
-        KEYWORDS="disk"
+        KEYWORDS="disk devices nodes modules"
            SHORT="Udev creates and removes device nodes"
 cat << EOF
 Udev creates and removes device nodes in /dev, based on events the kernel

==== //sgl/grimoires/test/disk/udev/HISTORY#66 (text) ====

@@ -1,3 +1,8 @@
+2006-05-10 Juuso Alasuutari <iuso at sourcemage.org>
+	* rules/50-default.rules: Fixed incorrect node naming for usb 
+	  printers, added new rules for various devices
+	* DETAILS: Updated PATCHLEVEL, added some new keywords
+
 2006-05-02 Juuso Alasuutari <iuso at sourcemage.org>
 	* INSTALL: Install early rules straight from source dir
 	* rules/05-udev-early.rules: Deleted

==== //sgl/grimoires/test/disk/udev/rules/50-default.rules#16 (text) ====

@@ -28,6 +28,16 @@
 # permissions for SCSI CD devices
 BUS=="scsi", KERNEL=="s[grt][0-9]*", SYSFS{type}=="5", MODE="0660", GROUP="cdrom"
 
+# tape devices
+KERNEL=="ht*", 		NAME="%k"
+KERNEL=="nht*", 	NAME="%k"
+KERNEL=="pt*", 		NAME="%k"
+KERNEL=="npt*", 	NAME="%k"
+KERNEL=="st*", 		NAME="%k"
+KERNEL=="nst*", 	NAME="%k"
+KERNEL=="osst*", 	NAME="%k"
+KERNEL=="nosst*", 	NAME="%k"
+
 # sound devices
 KERNEL=="admmidi", 		NAME="sound/%k", SYMLINK="%k"
 KERNEL=="adsp", 		NAME="sound/%k", SYMLINK="%k"
@@ -52,23 +62,37 @@
 KERNEL=="psaux", 	NAME="input/%k", SYMLINK="%k", MODE="0644"
 
 # misc devices
+KERNEL="agpgart", 	NAME="misc/%k", SYMLINK="%k"
 KERNEL=="rtc", 		NAME="misc/%k", SYMLINK+="%k", MODE="0644"
 KERNEL=="uinput", 	NAME="misc/%k", SYMLINK+="%k"
 KERNEL=="inotify", 	NAME="misc/%k", SYMLINK+="%k", MODE="0666"
 
-# console
-KERNEL=="console", 	NAME="%k", MODE="0600"
-KERNEL=="ptmx", 	NAME="%k", MODE="0666"
-KERNEL=="tty",		NAME="%k", MODE="0666"
-
 # tty devices
-KERNEL=="ttyS[0-9]*", 	NAME="%k", SYMLINK="tts/%n"
-KERNEL=="ttyUSB[0-9]*", NAME="%k", SYMLINK="tts/USB%n", MODE="0660"
+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=="ttyUSB[0-9]*", NAME="tts/USB%n", SYMLINK="%k", GROUP="tty", MODE="0660"
 KERNEL=="ippp0", 	NAME="%k", GROUP="tty"
 KERNEL=="isdn*", 	NAME="%k", GROUP="tty"
 KERNEL=="dcbri*", 	NAME="%k", GROUP="tty"
 KERNEL=="ircomm*", 	NAME="%k", GROUP="tty"
 
+# pty devices
+KERNEL=="ptmx", 		NAME="%k", GROUP="tty", MODE="0666"
+KERNEL=="pty[p-za-e][0-9a-f]*", NAME="pty/m%n", SYMLINK="%k", GROUP="tty"
+KERNEL=="tty[p-za-e][0-9a-f]*", NAME="pty/s%n", SYMLINK="%k", GROUP="tty"
+
+# vc devices
+KERNEL=="vcs", 		NAME="vcc/0", 	SYMLINK="%k", GROUP="tty"
+KERNEL=="vcs[0-9]*", 	NAME="vcc/%n", 	SYMLINK="%k", GROUP="tty"
+KERNEL=="vcsa", 	NAME="vcc/a0", 	SYMLINK="%k", GROUP="tty"
+KERNEL=="vcsa[0-9]*", 	NAME="vcc/a%n", SYMLINK="%k", GROUP="tty"
+
+# capi devices
+KERNEL="capi",          NAME="capi20", SYMLINK="isdn/capi20"
+KERNEL="capi*",         NAME="capi/%n"
+
 # cpu devices
 KERNEL=="cpu[0-9]*", 	NAME="cpu/%n/cpuid"
 KERNEL=="msr[0-9]*", 	NAME="cpu/%n/msr"
@@ -150,12 +174,12 @@
 # ls120 devices
 KERNEL=="ls120", 	NAME="%k", GROUP="disk"
 
-# printer
+# printer (usb printer rule must be before the rest)
+BUS=="usb", KERNEL=="lp[0-9]*", NAME="usb/%k", GROUP="lp", MODE="0660"
 KERNEL=="lp*", 		NAME="%k", GROUP="lp", MODE="0660"
 KERNEL=="irlpt", 	NAME="%k", GROUP="lp", MODE="0660"
 KERNEL=="usblp", 	NAME="%k", GROUP="lp", MODE="0660"
 KERNEL=="parport*", 	NAME="%k", GROUP="lp", MODE="0660"
-BUS=="usb", KERNEL=="lp[0-9]*", NAME="usb/%k", GROUP="lp", MODE="0660"
 
 # v4l devices
 KERNEL=="video[0-9]*", 	NAME="v4l/video%n", SYMLINK="video%n", GROUP="video", MODE="0660"
@@ -172,6 +196,9 @@
 
 # network devices
 KERNEL=="tun", 		NAME="net/%k"
+KERNEL=="ippp*", 	NAME="net/%k", SYMLINK="%k", MODE="0644"
+KERNEL=="ipstate*", 	NAME="net/%k", SYMLINK="%k", MODE="0660"
+KERNEL=="spx", 		NAME="net/%k", SYMLINK="%k", MODE="0644"
 
 # diskonkey devices
 KERNEL=="diskonkey*", 	NAME="%k", GROUP="disk"



More information about the SM-Commit mailing list