[SM-Commit] GIT changes to master grimoire by Flavien Bridault (3ddb66ae5920e15e4f5cad3181f93f205b320243)

Flavien Bridault scm at mail.sourcemage.org
Sun Sep 10 17:02:34 EDT 2006


GIT changes to master grimoire by Flavien Bridault <vlaaad at sourcemage.org>:

 disk/udev/52-modules.rules                        |   10 +++----
 disk/udev/DETAILS                                 |    2 -
 disk/udev/HISTORY                                 |   17 ++++++++++++
 disk/udev/INSTALL                                 |    4 +-
 disk/udev/init.d/coldplug                         |    5 ++-
 disk/udev/init.d/udevd                            |    1 
 disk/udev/rules/07-bindings.rules                 |    2 -
 disk/udev/rules/40-alsa.rules                     |    2 -
 disk/udev/rules/50-default.rules                  |   25 +++++-------------
 disk/udev/rules/70-cdrom_symlinks_and_perms.rules |    3 ++
 disk/udev/rules/rules.examples                    |   30 +++++++++++-----------
 11 files changed, 57 insertions(+), 44 deletions(-)

New commits:
commit af94343b9ed907a2271753aa51394c0d9481c908
Author: Flavien Bridault <vlaaad at sourcemage.org>
Commit: Flavien Bridault <vlaaad at sourcemage.org>

    udev: updated to 100
          made all the usual changes, key renamings, etc...
          finally solved the problem when booting since 098. Actually, udevd was not
          launched before coldplug, I fixed this with cleaner dependencies between scripts

commit b691ea6954edd455e4c2fb7a966b0d7241d69622
Author: Flavien Bridault <vlaaad at sourcemage.org>
Commit: Flavien Bridault <vlaaad at sourcemage.org>

    inkscape: updated to 0.44.1

diff --git a/disk/udev/52-modules.rules b/disk/udev/52-modules.rules
index eb7e18c..fac6f9c 100644
--- a/disk/udev/52-modules.rules
+++ b/disk/udev/52-modules.rules
@@ -8,7 +8,7 @@ # Check whether we need these rules for 
 ACTION!="add", GOTO="modprobe_end"
 
 # Autoload modules with aliases
-SYSFS{modalias}=="?*", RUN+="/sbin/modprobe $env{MODALIAS}"
+ATTRS{modalias}=="?*", ACTION=="add", RUN+="/sbin/modprobe $env{MODALIAS}"
 
 # PCMCIA
 SUBSYSTEM=="pcmcia_socket", RUN+="/sbin/modprobe pcmcia"
@@ -25,10 +25,10 @@ LABEL="mmc_end"
 
 # SCSI
 SUBSYSTEM!="scsi_device", GOTO="scsi_device_end"
-SYSFS{type}=="0|7|14", RUN+="/sbin/modprobe sd_mod"
-SYSFS{type}=="1", SYSFS{vendor}=="Onstream", SYSFS{model}!="ADR*" RUN+="/sbin/modprobe osst"
-SYSFS{type}=="1", RUN+="/sbin/modprobe st"
-SYSFS{type}=="[345]", RUN+="/sbin/modprobe sr_mod"
+ATTRS{type}=="0|7|14", RUN+="/sbin/modprobe sd_mod"
+ATTRS{type}=="1", ATTRS{vendor}=="Onstream", ATTRS{model}!="ADR*" RUN+="/sbin/modprobe osst"
+ATTRS{type}=="1", RUN+="/sbin/modprobe st"
+ATTRS{type}=="[345]", RUN+="/sbin/modprobe sr_mod"
 RUN+="/sbin/modprobe sg"
 LABEL="scsi_device_end"
 
diff --git a/disk/udev/DETAILS b/disk/udev/DETAILS
index 6762441..7718360 100755
--- a/disk/udev/DETAILS
+++ b/disk/udev/DETAILS
@@ -2,7 +2,7 @@
 if [ "$RECENT_KERNEL" == "n" ]; then
          VERSION=092
 else
-         VERSION=097
+         VERSION=100
 fi
           SOURCE=$SPELL-$VERSION.tar.bz2
          SOURCE2=$SOURCE.sign
diff --git a/disk/udev/HISTORY b/disk/udev/HISTORY
index c37456f..8158097 100644
--- a/disk/udev/HISTORY
+++ b/disk/udev/HISTORY
@@ -1,3 +1,20 @@
+2006-09-10 Flavien Bridault <vlaaad at sourcemage.org>
+	* DETAILS: Updated to 100
+	* rules/*.rules, 52-modules.rules: Some keys have been renamed,
+	  BUS->SUBSYSTEMS, SYSFS->ATTRS, ID->KERNEL, DRIVER->DRIVERS, see
+	  the udev RELEASE-NOTES for more informations.
+	* 50-default.rules: Removed cdrom_id related rules, a dedicated rules
+	  file is now installed by default, replaced cdrw group by burning group,
+	  as this is the name we employ for that, removed missing usb group,
+	  replaced scsi by disk group
+	  moved symlinks and perms rules for cdrom so that they are processed
+	  after the new file 60-cdrom_id.rules
+	* 70-cdrom_symlinks_and_perms.rules: created
+	* rules.examples: same renaming and replaced some = by == where
+	  needed, examples rules should also try to be correct ;-)
+	* init.d/udevd: actually needs devices, caused troubles on boot
+	* init.d/coldplug: only needs udevd since udevd now needs devices
+
 2006-09-05 Flavien Bridault <vlaaad at sourcemage.org>
 	* INSTALL: handle rules files install for 092 (bug #13073)
 
diff --git a/disk/udev/INSTALL b/disk/udev/INSTALL
index 9b03ee0..0f051b5 100755
--- a/disk/udev/INSTALL
+++ b/disk/udev/INSTALL
@@ -36,12 +36,12 @@ fi  &&
 if [ "$RECENT_KERNEL" == "n" ]; then
   # udevstart and udevsend are nolonger installed by default. we need them for kernel < 2.6.15rc1
   install udevsend udevstart  ${INSTALL_ROOT}/sbin  &&
-  FIRMWARE_HELPER_NAME="firmware_helper"
+  FIRMWARE_HELPER_NAME="/lib/udev/firmware_helper"
 else
   FIRMWARE_HELPER_NAME="firmware.sh"
 fi  &&
 
-FIRMWARE_RULE="SUBSYSTEM==\"firmware\", ACTION==\"add\", RUN+=\"/lib/udev/$FIRMWARE_HELPER_NAME\""  &&
+FIRMWARE_RULE="SUBSYSTEM==\"firmware\", ACTION==\"add\", RUN+=\"$FIRMWARE_HELPER_NAME\""  &&
 echo $FIRMWARE_RULE >> ${UDEV_CFG}/rules.d/50-default.rules  &&
 
 make prefix=${INSTALL_ROOT}/ exec_prefix=${INSTALL_ROOT}/ V=true ${OPTS} install   &&
diff --git a/disk/udev/init.d/coldplug b/disk/udev/init.d/coldplug
index a2442b9..cebfb79 100644
--- a/disk/udev/init.d/coldplug
+++ b/disk/udev/init.d/coldplug
@@ -3,16 +3,17 @@ #!/bin/bash
 PROGRAM=/bin/false
 RUNLEVEL=DEV
 ESSENTIAL=yes
-NEEDS="devices udevd"
+NEEDS="udevd"
 
 # source function library
 . /etc/init.d/smgl_init
 
 start() 
 {
+  echo "Populating /dev with existing devices"
   /sbin/udevtrigger
   # Wait for udev events
-  /sbin/udevsettle
+  /sbin/udevsettle --timeout=60
 }
 
 stop() { exit 0; }
diff --git a/disk/udev/init.d/udevd b/disk/udev/init.d/udevd
index ce632b8..9942271 100755
--- a/disk/udev/init.d/udevd
+++ b/disk/udev/init.d/udevd
@@ -4,6 +4,7 @@ PROGRAM=/sbin/udevd
 ARGS="--daemon"
 RUNLEVEL=DEV
 ESSENTIAL=yes
+NEEDS="devices"
 
 . /etc/init.d/smgl_init
 
diff --git a/disk/udev/rules/07-bindings.rules b/disk/udev/rules/07-bindings.rules
index 3929263..a4a03eb 100644
--- a/disk/udev/rules/07-bindings.rules
+++ b/disk/udev/rules/07-bindings.rules
@@ -1,2 +1,2 @@
 # Bind MAC addresses to interface names if they are set with netconf
-KERNEL=="eth*", SYSFS{address}=="?*", PROGRAM="/lib/udev/mac2name %s{address}", NAME="%c"
+KERNEL=="eth*", ATTRS{address}=="?*", PROGRAM="/lib/udev/mac2name %s{address}", NAME="%c"
diff --git a/disk/udev/rules/40-alsa.rules b/disk/udev/rules/40-alsa.rules
index 74f333b..0d0f4c2 100644
--- a/disk/udev/rules/40-alsa.rules
+++ b/disk/udev/rules/40-alsa.rules
@@ -12,4 +12,4 @@ SUBSYSTEM=="usb", ACTION=="add", ENV{PRO
 SUBSYSTEM=="usb", ACTION=="add", ENV{PRODUCT}=="1604/8001/*", RUN+="/sbin/startproc /usr/bin/us428control"
 SUBSYSTEM=="usb", ACTION=="add", ENV{PRODUCT}=="1604/8005/*", RUN+="/sbin/startproc /usr/bin/us428control"
 SUBSYSTEM=="sound", KERNEL=="controlC?", RUN+="/usr/sbin/alsactl -F restore %n"
-SUBSYSTEM=="sound", KERNEL=="hwC?D2", DRIVER=="EMU10K1_Audigy", RUN+="/etc/alsa.d/udev-soundfont"
+SUBSYSTEM=="sound", KERNEL=="hwC?D2", DRIVERS=="EMU10K1_Audigy", RUN+="/etc/alsa.d/udev-soundfont"
diff --git a/disk/udev/rules/50-default.rules b/disk/udev/rules/50-default.rules
index 28b6e5b..039c04d 100644
--- a/disk/udev/rules/50-default.rules
+++ b/disk/udev/rules/50-default.rules
@@ -31,24 +31,15 @@ # disk devices
 KERNEL=="sd*",           NAME="%k", GROUP="disk"
 KERNEL=="dasd*",         NAME="%k", GROUP="disk"
 KERNEL=="ataraid*",      NAME="%k", GROUP="disk"
-BUS=="scsi", KERNEL=="sr[0-9]*", GROUP="scsi"
-BUS=="scsi", KERNEL=="sg[0-9]*", GROUP="burning"
+SUBSYSTEMS=="scsi", KERNEL=="sr[0-9]*", GROUP="disk"
+SUBSYSTEMS=="scsi", KERNEL=="sg[0-9]*", GROUP="burning"
 
 # all block devices
 SUBSYSTEM=="block", GROUP="disk", MODE="0640"
-SUBSYSTEM=="block", SYSFS{removable}=="1", GROUP="floppy", MODE="0660"
-
-# ide cdrom devices
-BUS=="ide", KERNEL=="hd[a-z]", ACTION=="add", IMPORT="cdrom_id --export $tempnode"
+SUBSYSTEM=="block", ATTRS{removable}=="1", GROUP="floppy", MODE="0660"
 
 # scsi cdrom devices
-BUS=="scsi", KERNEL=="sr[0-9]*", ACTION=="add", IMPORT="cdrom_id --export $tempnode"
-BUS=="scsi", KERNEL=="scd[a-z]", ACTION=="add", IMPORT="cdrom_id --export $tempnode"
-BUS=="scsi", KERNEL=="s[grt][0-9]*", SYSFS{type}=="5", MODE="0660", GROUP="cdrom"
-
-# cdrom device symlinks and permissions
-ENV{ID_CDROM}=="?*", PROGRAM="cdsymlink_helper %k", SYMLINK+="%c", GROUP="cdrom"
-ENV{ID_CDROM_CD_R}=="?*", SYMLINK+="%c", MODE="0660", GROUP="burning"
+SUBSYSTEMS=="scsi", KERNEL=="s[grt][0-9]*", ATTRS{type}=="5", MODE="0660", GROUP="cdrom"
 
 # tape devices
 KERNEL=="ht*", 		NAME="%k"
@@ -136,7 +127,7 @@ KERNEL=="zero", 	NAME="%k", MODE="0666"
 # usb devices
 KERNEL=="hiddev*", 		NAME="usb/%k"
 KERNEL=="auer*", 		NAME="usb/%k"
-KERNEL=="legousbtower*", 	NAME="usb/%k", GROUP="usb"
+KERNEL=="legousbtower*", 	NAME="usb/%k"
 KERNEL=="dabusb*", 		NAME="usb/%k"
 
 # dvb devices
@@ -160,7 +151,7 @@ # ls120 devices
 KERNEL=="ls120", 	NAME="%k", GROUP="disk"
 
 # printer (usb printer rule must be before the rest)
-BUS=="usb", KERNEL=="lp[0-9]*", NAME="usb/%k", GROUP="lp", MODE="0660"
+SUBSYSTEMS=="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"
@@ -198,8 +189,8 @@ # Sony Vaio Jogdial sonypi device
 KERNEL=="sonypi", 	NAME="%k", MODE="0666"
 
 # packet devices
-KERNEL=="pktcdvd", NAME="pktcdvd/control", GROUP="cdrw", MODE="0660"
-KERNEL=="pktcdvd[0-9]*", NAME="pktcdvd/pktcdvd%n", GROUP="cdrw", MODE="0660"
+KERNEL=="pktcdvd", NAME="pktcdvd/control", GROUP="burning", MODE="0660"
+KERNEL=="pktcdvd[0-9]*", NAME="pktcdvd/pktcdvd%n", GROUP="burning", MODE="0660"
 
 # infiniband devices
 KERNEL=="umad*", 	NAME="infiniband/%k"
diff --git a/disk/udev/rules/70-cdrom_symlinks_and_perms.rules b/disk/udev/rules/70-cdrom_symlinks_and_perms.rules
new file mode 100644
index 0000000..f4aa4bb
--- /dev/null
+++ b/disk/udev/rules/70-cdrom_symlinks_and_perms.rules
@@ -0,0 +1,3 @@
+# cdrom device symlinks and permissions
+ENV{ID_CDROM}=="?*", PROGRAM="cdsymlink_helper %k", SYMLINK+="%c", GROUP="cdrom"
+ENV{ID_CDROM_CD_R}=="?*", SYMLINK+="%c", MODE="0660", GROUP="burning"
diff --git a/disk/udev/rules/rules.examples b/disk/udev/rules/rules.examples
index c36098d..16cc41e 100644
--- a/disk/udev/rules/rules.examples
+++ b/disk/udev/rules/rules.examples
@@ -3,40 +3,40 @@ # fields.  See the udev man page for a f
 # These are just some examples, check the manpage for the full options
 
 # Looking for scsi bus id 42:0:0:1
-#BUS="scsi", PROGRAM="/bin/echo -n test-%b", RESULT="test-42:0:0:1", NAME="%c"
+#SUBSYSTEMS=="scsi", PROGRAM="/bin/echo -n test-%b", RESULT="test-42:0:0:1", NAME="%c"
 
 # A usb camera.
-#BUS="usb", SYSFS_vendor="FUJIFILM", SYSFS_model="M100", NAME="camera%n"
+#SUBSYSTEMS=="usb", ATTRS{vendor}=="FUJIFILM", ATTRS{model}=="M100", NAME="camera%n"
 
 # USB Epson printer to be called lp_epson
-#BUS="usb", SYSFS_serial="HXOLL0012202323480", NAME="lp_epson"
+#SUBSYSTEMS="usb", ATTRS{serial}="HXOLL0012202323480", NAME="lp_epson"
 
 # USB HP printer to be called lp_hp
-#BUS="usb", SYSFS_serial="W09090207101241330", NAME="lp_hp"
+#SUBSYSTEMS="usb", ATTRS{serial}="W09090207101241330", NAME="lp_hp"
 
 # sound card with PCI bus id 00:0b.0 to be the first sound card
-#BUS="pci", ID="00:0b.0", NAME="dsp"
+#SUBSYSTEMS=="pci", KERNELS=="00:0b.0", NAME="dsp"
 
 # sound card with PCI bus id 00:07.1 to be the second sound card
-#BUS="pci", ID="00:07.1", NAME="dsp1" 
+#SUBSYSTEMS=="pci", KERNELS=="00:07.1", NAME="dsp1" 
 
 # USB mouse plugged into the third port of the first hub to be called mouse0
-#BUS="usb", PLACE="1.3", NAME="mouse0"
+#SUBSYSTEMS=="usb", PLACE=="1.3", NAME="mouse0"
 
 # USB tablet plugged into the third port of the second hub to be called mouse1
-#BUS="usb", PLACE="2.3", NAME="mouse1"
-#BUS="usb", PLACE="2.4", NAME="mouse2"
+#SUBSYSTEMS=="usb", PLACE=="2.3", NAME="mouse1"
+#SUBSYSTEMS=="usb", PLACE=="2.4", NAME="mouse2"
 
 # ttyUSB1 should always be called visor
-#KERNEL="ttyUSB1", NAME="visor"
-#KERNEL="ttyUSB0", NAME="pl2303"
+#KERNEL=="ttyUSB1", NAME="visor"
+#KERNEL=="ttyUSB0", NAME="pl2303"
 
 # a devfs like way to name some tty devices
-#KERNEL="ttyS*", NAME="tts/%n"
-#KERNEL="tty*", NAME="vc/%n"
+#KERNEL=="ttyS*", NAME="tts/%n"
+#KERNEL=="tty*", NAME="vc/%n"
 
 # if this is a ide cdrom, name it the default name, and create a symlink to cdrom
-#BUS="ide", PROGRAM="/bin/cat /proc/ide/%k/media", RESULT="cdrom", NAME="%k", SYMLINK="cdrom" 
+#SUBSYSTEMS=="ide", PROGRAM="/bin/cat /proc/ide/%k/media", RESULT=="cdrom", NAME="%k", SYMLINK="cdrom" 
 
 # DRI devices always go into a subdirectory (as per the LSB spec)
-#KERNEL="card*", NAME="dri/card%n"
+#KERNEL=="card*", NAME="dri/card%n"



More information about the SM-Commit mailing list