Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] PERFORCE change 78783 by Juuso Alasuutari for review

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Perforce Review Daemon <p4review AT smee.org>
  • To: "Andrew Stitt" <a AT t.armory.com>, "Arjan Bouter" <abouter AT sourcemage.org>, "SM-Commit Daemon" <sm-commit AT lists.ibiblio.org>, "duane_malcolm" <d.malcolm AT auckland.ac.nz>, "Ethan Grammatikidis" <eekee AT eekee.is-a-geek.org>, "Gareth Clay" <gareth AT caffeinefuelled.co.uk>, "Maurizio Boriani" <baux AT member.fsf.org>, "Pieter Lenaerts" <e-type AT sourcemage.org>, "Robin Cook" <rcook AT wyrms.net>, "Seth Woolley" <seth AT swoolley.homeip.net>, "Unet" <unet AT sourcemage.org>, "vladimir_marek" <vlmarek AT volny.cz>
  • Subject: [SM-Commit] PERFORCE change 78783 by Juuso Alasuutari for review
  • Date: Tue, 2 May 2006 00:55:01 +0100 (BST)

Change 78783 by juuso_alasuutari@juuso_alasuutari-kamayuq on 2006/05/02
00:52:02

Fixes to 52-modules.rules, small edits here and there, a ton of
new rules and some fixes to 50-default.rules. Still WIP.

Affected files ...

... //sgl/grimoires/devel/disk/udev/52-modules.rules#2 edit
... //sgl/grimoires/devel/disk/udev/HISTORY#85 edit
... //sgl/grimoires/devel/disk/udev/INSTALL#30 edit
... //sgl/grimoires/devel/disk/udev/PRE_BUILD#6 edit
... //sgl/grimoires/devel/disk/udev/modprobe.aliases#1 add
... //sgl/grimoires/devel/disk/udev/rules/05-udev-early.rules#2 delete
... //sgl/grimoires/devel/disk/udev/rules/50-default.rules#18 edit

Differences ...

==== //sgl/grimoires/devel/disk/udev/52-modules.rules#2 (text) ====

@@ -1,16 +1,15 @@
# Module loading rules for systems without hotplug

+# Autoload modules that lack aliases but have them defined in
+# /etc/modprobe.conf
+ENV{MODALIAS}!="?*", SUBSYSTEM=="pnp", RUN+="/bin/sh -c 'while read id; do
/sbin/modprobe pnp:d$$id; done < /sys$devpath/id'"
+
# Check whether we need these rules for this event
ACTION!="add", GOTO="modprobe_end"
-ENV{PHYSDEVDRIVER}=="?*", SUBSYSTEM!="input", GOTO="modprobe_end"

# Autoload modules with aliases
SYSFS{modalias}=="?*", RUN+="/sbin/modprobe $env{MODALIAS}"

-# Autoload modules that lack aliases but have them defined in
-# /etc/modprobe.conf
-ENV{MODALIAS}!="?*", SUBSYSTEM=="pnp", RUN+="/bin/sh -c 'while read id; do
/sbin/modprobe pnp:d$$id; done < /sys$devpath/id'"
-
# PCMCIA
SUBSYSTEM=="pcmcia_socket", RUN+="/sbin/modprobe pcmcia"


==== //sgl/grimoires/devel/disk/udev/HISTORY#85 (text) ====

@@ -1,3 +1,16 @@
+2006-05-02 Juuso Alasuutari <iuso AT sourcemage.org>
+ * INSTALL: Install early rules straight from source dir
+ * rules/05-udev-early.rules: Deleted
+ * rules/50-default.rules: Thiefed a ton of rules from gentoo
+ rules file, fixed some typos
+ * 52-modules.rules: Some edits
+
+2006-04-30 Juuso Alasuutari <iuso AT sourcemage.org>
+ * INSTALL: Install modprobe aliases for non-hotplug systems
+
+2006-04-29 Juuso Alasuutari <iuso AT sourcemage.org>
+ * PRE_BUILD: Add fix for upstream typo in alsa rules file
+
2006-04-28 Juuso Alasuutari <iuso AT sourcemage.org>
* DETAILS: Updated PATCHLEVEL


==== //sgl/grimoires/devel/disk/udev/INSTALL#30 (xtext) ====

@@ -9,15 +9,23 @@
install_config_file $file ${UDEV_CFG}/rules.d/$(basename $file)
done &&

-# install diff default rules on hotplug and non-hotplug systems
+# install diff default rules on hotplug and non-hotplug systems, install
+# required modprobe aliases for non-hotplug rules
if spell_ok hotplug; then
install_config_file $SCRIPT_DIRECTORY/52-modules.rules-hotplug
${UDEV_CFG}/rules.d/52-modules.rules
else
- install_config_file $SCRIPT_DIRECTORY/52-modules.rules
${UDEV_CFG}/rules.d/52-modules.rules
+ install_config_file $SCRIPT_DIRECTORY/52-modules.rules
${UDEV_CFG}/rules.d/52-modules.rules &&
+ mkdir -p $INSTALL_ROOT/etc/modprobe.d &&
+ install_config_file $SCRIPT_DIRECTORY/modprobe.aliases
$INSTALL_ROOT/etc/modprobe.d/udev
fi

+# install early rules
+install_config_file $SOURCE_DIRECTORY/etc/udev/05-udev-early.rules \
+ ${UDEV_CFG}/rules.d/05-udev-early.rules
+
# install alsa rules
-install_config_file etc/udev/suse/40-alsa.rules
${UDEV_CFG}/rules.d/40-alsa.rules
+install_config_file etc/udev/suse/40-alsa.rules \
+ ${UDEV_CFG}/rules.d/40-alsa.rules

# udevstart and udevsend are nolonger installed by default. we still need
them
install udevsend udevstart ${INSTALL_ROOT}/sbin &&

==== //sgl/grimoires/devel/disk/udev/PRE_BUILD#6 (xtext) ====

@@ -2,6 +2,9 @@
cd $SOURCE_DIRECTORY &&
patch -p0 < $SCRIPT_DIRECTORY/Makefile.patch &&

+# Correct typo in alsa rules file
+sedit "s/^0$//" etc/udev/suse/40-alsa.rules
+
if [[ "$UDEV_STATIC" == 'y' ]]; then
message "${MESSAGE_COLOR}Setting up static build
directory...${DEFAULT_COLOR}" &&
mkdir __static__ &&

==== //sgl/grimoires/devel/disk/udev/rules/50-default.rules#18 (text) ====

@@ -1,26 +1,25 @@
# There are a number of modifiers that are allowed to be used in some of the
# fields. See the udev man page for a full description of them.

-# All block devices
-SUBSYSTEM=="block", GROUP="disk", MODE="0640"
+# all block devices
+SUBSYSTEM=="block", GROUP="disk", MODE="0640"
SUBSYSTEM=="block", SYSFS{removable}=="1", GROUP="floppy"

# device mapper creates its own device nodes so ignore these
-#KERNEL=="dm-[0-9]*", NAME=""
+KERNEL=="dm-[0-9]*", OPTIONS="ignore_device"
KERNEL=="device-mapper", NAME="mapper/control"

-# Disk devices
+# 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"

-# CDrom devices
-BUS=="ide", KERNEL=="hd[a-z]", ACTION=="add", IMPORT="cdrom_id --export
$tempnode"
-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"
-
+# cdrom devices
+BUS=="ide", KERNEL=="hd[a-z]", ACTION=="add", IMPORT="cdrom_id --export
$tempnode"
+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"
ENV{ID_CDROM}=="?*", SYMLINK+="cdrom%e", GROUP="cdrom"
ENV{ID_CDROM_CD_RW}=="?*", SYMLINK+="cdrw%e", MODE="0660",
GROUP="burning"
ENV{ID_CDROM_DVD}=="?*", SYMLINK+="dvd%e"
@@ -29,76 +28,170 @@
# permissions for SCSI CD devices
BUS=="scsi", KERNEL=="s[grt][0-9]*", SYSFS{type}=="5", MODE="0660",
GROUP="cdrom"

-# alsa devices
-SUBSYSTEM=="sound", GROUP="audio", MODE="0660"
-KERNEL=="controlC[0-9]*", NAME="snd/%k", RUN="/usr/sbin/alsactl restore"
-KERNEL=="hw[CD0-9]*", NAME="snd/%k"
-KERNEL=="pcm[CD0-9cp]*", NAME="snd/%k"
-KERNEL=="midi[CD0-9]*", NAME="snd/%k"
-KERNEL=="timer", NAME="snd/%k"
-KERNEL=="seq", NAME="snd/%k"
-
# sound devices
-KERNEL=="admmidi" NAME="sound/%k", SYMLINK="%k"
-KERNEL=="adsp", NAME="sound/%k", SYMLINK="%k"
-KERNEL=="amidi" NAME="sound/%k", SYMLINK="%k"
-KERNEL=="adsp[0-9]*", NAME="sound/%k", SYMLINK="%k"
-KERNEL=="audio", NAME="sound/%k", SYMLINK="%k"
-KERNEL=="dmmidi" NAME="sound/%k", SYMLINK="%k"
-KERNEL=="audio[0-9]*", NAME="sound/%k", SYMLINK="%k"
-KERNEL=="dsp", NAME="sound/%k", SYMLINK="%k"
-KERNEL=="dsp[0-9]*", NAME="sound/%k", SYMLINK="%k"
-KERNEL=="mixer", NAME="sound/%k", SYMLINK="%k"
-KERNEL=="mixer[0-9]*", NAME="sound/%k", SYMLINK="%k"
-KERNEL=="sequencer", NAME="sound/%k", SYMLINK="%k"
-KERNEL=="sequencer[0-9]*", NAME="sound/%k", SYMLINK="%k"
+KERNEL=="admmidi", NAME="sound/%k", SYMLINK="%k"
+KERNEL=="adsp", NAME="sound/%k", SYMLINK="%k"
+KERNEL=="amidi", NAME="sound/%k", SYMLINK="%k"
+KERNEL=="adsp[0-9]*", NAME="sound/%k", SYMLINK="%k"
+KERNEL=="audio", NAME="sound/%k", SYMLINK="%k"
+KERNEL=="dmmidi", NAME="sound/%k", SYMLINK="%k"
+KERNEL=="audio[0-9]*", NAME="sound/%k", SYMLINK="%k"
+KERNEL=="dsp", NAME="sound/%k", SYMLINK="%k"
+KERNEL=="dsp[0-9]*", NAME="sound/%k", SYMLINK="%k"
+KERNEL=="mixer", NAME="sound/%k", SYMLINK="%k"
+KERNEL=="mixer[0-9]*", NAME="sound/%k", SYMLINK="%k"
+KERNEL=="sequencer", NAME="sound/%k", SYMLINK="%k"
+KERNEL=="sequencer[0-9]*", NAME="sound/%k", SYMLINK="%k"

# input devices
-KERNEL=="mice", NAME="input/%k", MODE="0644"
-KERNEL=="mouse*", NAME="input/%k", MODE="0644"
-KERNEL=="event*", NAME="input/%k", MODE="0644"
-KERNEL=="js*", NAME="input/%k", MODE="0644"
-KERNEL=="ts*", NAME="input/%k", MODE="0644"
-KERNEL=="psaux" NAME="input/%k", SYMLINK="%k", MODE="0644"
+KERNEL=="mice", NAME="input/%k", MODE="0644"
+KERNEL=="mouse*", NAME="input/%k", MODE="0644"
+KERNEL=="event*", NAME="input/%k", MODE="0644"
+KERNEL=="js*", NAME="input/%k", MODE="0644"
+KERNEL=="ts*", NAME="input/%k", MODE="0644"
+KERNEL=="psaux", NAME="input/%k", SYMLINK="%k", MODE="0644"

# misc devices
-KERNEL=="console" NAME="%k", MODE="0600"
-KERNEL=="full", NAME="%k", MODE="0666"
-KERNEL=="kmem", NAME="%k", MODE="0640"
-KERNEL=="mem", NAME="%k", MODE="0640"
-KERNEL=="null", NAME="%k", MODE="0666"
-KERNEL=="port", NAME="%k", MODE="0640"
-KERNEL=="random", NAME="%k", MODE="0644"
-KERNEL=="rtc", NAME="%k", MODE="0644"
+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"
-KERNEL=="urandom", NAME="%k", MODE="0644"
-KERNEL=="zero", 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=="ippp0", NAME="%k", GROUP="tty"
+KERNEL=="isdn*", NAME="%k", GROUP="tty"
+KERNEL=="dcbri*", NAME="%k", GROUP="tty"
+KERNEL=="ircomm*", NAME="%k", GROUP="tty"
+
+# cpu devices
+KERNEL=="cpu[0-9]*", NAME="cpu/%n/cpuid"
+KERNEL=="msr[0-9]*", NAME="cpu/%n/msr"
+KERNEL=="microcode", NAME="cpu/microcode"
+
+# i2c devices
+KERNEL=="i2c-[0-9]*", NAME="i2c/%n", SYMLINK+="%k"
+
+# loop devices
+KERNEL=="loop[0-9]*", NAME="loop/%n", SYMLINK+="%k", GROUP="disk"
+
+# md block devices
+KERNEL=="md[0-9]*", NAME="md/%n", SYMLINK+="%k", GROUP="disk"
+
+# aoe char devices,
+SUBSYSTEM=="aoe", KERNEL=="discover", NAME="etherd/%k", GROUP="disk",
MODE="0220"
+SUBSYSTEM=="aoe", KERNEL=="err", NAME="etherd/%k", GROUP="disk",
MODE="0440"
+SUBSYSTEM=="aoe", KERNEL=="interfaces", NAME="etherd/%k", GROUP="disk",
MODE="0220"
+
+# netlink devices
+KERNEL=="route", NAME="netlink/%k"
+KERNEL=="skip", NAME="netlink/%k"
+KERNEL=="usersock", NAME="netlink/%k"
+KERNEL=="fwmonitor", NAME="netlink/%k"
+KERNEL=="tcpdiag", NAME="netlink/%k"
+KERNEL=="nflog", NAME="netlink/%k"
+KERNEL=="xfrm", NAME="netlink/%k"
+KERNEL=="arpd", NAME="netlink/%k"
+KERNEL=="route6", NAME="netlink/%k"
+KERNEL=="ip6_fw", NAME="netlink/%k"
+KERNEL=="dnrtmsg", NAME="netlink/%k"
+KERNEL=="tap*", NAME="netlink/%k"
+
+# ramdisk devices
+KERNEL=="ram[0-9]*", NAME="rd/%n", SYMLINK+="%k"
+
+# IEEE1394 (firewire) devices (must be before raw devices below)
+KERNEL=="raw1394", NAME="%k", GROUP="video"
+KERNEL=="dv1394*", NAME="dv1394/%n", GROUP="video"
+KERNEL=="video1394*", NAME="video1394/%n", GROUP="video"
+
+# raw devices
+KERNEL=="raw[0-9]*", NAME="raw/%k", GROUP="disk"
+KERNEL=="ram*", NAME="%k", GROUP="disk"
+
+# memory devices
+KERNEL=="random", NAME="%k", MODE="0666"
+KERNEL=="urandom", NAME="%k", MODE="0444"
+KERNEL=="mem", NAME="%k", MODE="0640"
+KERNEL=="kmem", NAME="%k", MODE="0640"
+KERNEL=="port", NAME="%k", MODE="0640"
+KERNEL=="full", NAME="%k", MODE="0666"
+KERNEL=="null", NAME="%k", MODE="0666"
+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=="dabusb*", NAME="usb/%k"
+
+# dvb devices
+SUBSYSTEM=="dvb", PROGRAM="/bin/sh -c 'K=%k; K=$${K#dvb}; printf
dvb/adapter%%i/%%s $${K%%%%.*} $${K#*.}'", NAME="%c", GROUP="video"
+
+# Asterisk Zaptel devices
+KERNEL=="zapctl", NAME="zap/ctl"
+KERNEL=="zaptimer", NAME="zap/timer"
+KERNEL=="zapchannel", NAME="zap/channel"
+KERNEL=="zappseudo", NAME="zap/pseudo"
+KERNEL=="zap[0-9]*", NAME="zap/%n"
+
+# jaz devices
+KERNEL=="jaz*", NAME="%k", GROUP="disk"
+
+# zip devices
+KERNEL=="pocketzip*", NAME="%k", GROUP="disk"
+KERNEL=="zip*", NAME="%k", GROUP="disk"

-# needed to create ptys
-KERNEL=="ptmx", NAME="%k", MODE="0666"
+# ls120 devices
+KERNEL=="ls120", NAME="%k", GROUP="disk"

# printer
-KERNEL=="lp*", NAME="%k", MODE="0660"
-# HP printers
-BUS=="usb", KERNEL=="lp[0-9]*", SYMLINK="usb%k"
+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"
-KERNEL=="radio[0-9]*", NAME="v4l/radio%n", GROUP="video", MODE="0660"
-KERNEL=="vbi[0-9]*", NAME="v4l/vbi%n", SYMLINK="vbi%n", GROUP="video",
MODE="0660"
-KERNEL=="vtx[0-9]*", NAME="v4l/vtx%n", GROUP="video", MODE="0660"
+KERNEL=="video[0-9]*", NAME="v4l/video%n", SYMLINK="video%n",
GROUP="video", MODE="0660"
+KERNEL=="radio[0-9]*", NAME="v4l/radio%n", GROUP="video", MODE="0660"
+KERNEL=="vbi[0-9]*", NAME="v4l/vbi%n", SYMLINK="vbi%n", GROUP="video",
MODE="0660"
+KERNEL=="vtx[0-9]*", NAME="v4l/vtx%n", GROUP="video", MODE="0660"
+
+# video devices
+KERNEL=="card*", NAME="dri/card%n", MODE="0660", GROUP="video"
+KERNEL=="3dfx*", NAME="%k", MODE="0660", GROUP="video"
+KERNEL=="nvidia*", NAME="%k", MODE="0660", GROUP="video"
+KERNEL=="fb[0-9]", NAME="%k", MODE="0660", GROUP="video"
+KERNEL=="svga[0-9]", NAME="%k", MODE="0660", GROUP="video"
+
+# network devices
+KERNEL=="tun", NAME="net/%k"
+
+# diskonkey devices
+KERNEL=="diskonkey*", NAME="%k", GROUP="disk"
+
+# rem_ide devices
+KERNEL=="microdrive*", NAME="%k", GROUP="disk"

-#nvidia devices
-KERNEL=="nvidia*" NAME="%k", MODE="0660", GROUP="video"
+# kbd devices
+KERNEL=="kbd", NAME="%k", MODE="0664"

-#framebuffer devices
-KERNEL=="fb[0-9]", NAME="%k", MODE="0660", GROUP="video"
+# Sony Vaio Jogdial sonypi device
+KERNEL=="sonypi", NAME="%k", MODE="0666"

-#svgalib devices
-KERNEL=="svga[0-9]", NAME="%k", MODE="0660", GROUP="video"
+# packet devices
+KERNEL=="pktcdvd", NAME="pktcdvd/control", GROUP="cdrw", MODE="0660"
+KERNEL=="pktcdvd[0-9]*", NAME="pktcdvd/pktcdvd%n", GROUP="cdrw", MODE="0660"

-# Network devices
-KERNEL=="tun", NAME="net/%k"
+# infiniband devices
+KERNEL=="umad*", NAME="infiniband/%k"
+KERNEL=="issm*", NAME="infiniband/%k"

-# Load firmware
+# load firmware
SUBSYSTEM=="firmware", ACTION=="add", RUN+="/lib/udev/firmware_helper"



  • [SM-Commit] PERFORCE change 78783 by Juuso Alasuutari for review, Perforce Review Daemon, 05/01/2006

Archive powered by MHonArc 2.6.24.

Top of Page