[arch-commits] CVS update of core/base/udev (14 files)
Tobias Powalowski
tpowa at archlinux.org
Wed Dec 12 06:20:27 UTC 2007
Date: Wednesday, December 12, 2007 @ 01:20:27
Author: tpowa
Path: /home/cvs-core/core/base/udev
Removed: cpufreq.sh (1.1) ide-floppy.sh (1.2) ide-modules.sh (1.1)
ide-storage.sh (1.1) modalias_ieee1394 (1.1)
net-persistent.patch (1.1) path_id.patch (1.1) post-107.patch (1.1)
scsi-devfs.sh (1.1) udev.patch (1.2) udev.permissions (1.7)
udevtrigger-ordering.patch (1.1) usb-storage.sh (1.1)
usb_id-fix.patch (1.1)
'upgpkg: removed old files'
----------------------------+
cpufreq.sh | 18 ---
ide-floppy.sh | 3
ide-modules.sh | 11 --
ide-storage.sh | 3
modalias_ieee1394 | 8 -
net-persistent.patch | 37 -------
path_id.patch | 14 --
post-107.patch | 176 ------------------------------------
scsi-devfs.sh | 81 ----------------
udev.patch | 19 ---
udev.permissions | 205 -------------------------------------------
udevtrigger-ordering.patch | 36 -------
usb-storage.sh | 3
usb_id-fix.patch | 107 ----------------------
14 files changed, 721 deletions(-)
Index: core/base/udev/cpufreq.sh
diff -u core/base/udev/cpufreq.sh:1.1 core/base/udev/cpufreq.sh:removed
--- core/base/udev/cpufreq.sh:1.1 Sat Feb 4 10:49:59 2006
+++ core/base/udev/cpufreq.sh Wed Dec 12 01:20:27 2007
@@ -1,18 +0,0 @@
-#! /bin/sh
-# Loading cpufreq modules if stepping is possible
-# created by Tobias Powalowski <tpowa at archlinux.org> for Archlinux
-. /etc/rc.conf
-
-[ -f /proc/cmdline ] && load_modules=$(awk -Fload_modules= '{print $2}' < /proc/cmdline)
-
-if [ "$MOD_AUTOLOAD" = "yes" -o "$MOD_AUTOLOAD" = "YES" -a "$load_modules" != "off" ]; then
- if [ -f /proc/cpuinfo ]; then
- if ! [ `cat /proc/cpuinfo | grep stepping | cut -d" " -f2` = "0" ]; then
- if [ -d /lib/modules/$(uname -r)/kernel/arch/i386/kernel/cpu/cpufreq/ ]; then
- for i in /lib/modules/$(uname -r)/kernel/arch/i386/kernel/cpu/cpufreq/* ; do
- /lib/udev/load-modules.sh `echo $i |sed -ne "s#^/.*/\(.*\)\.ko.*#\1#p"` > /dev/null 2>&1
- done
- fi
- fi
- fi
-fi
Index: core/base/udev/ide-floppy.sh
diff -u core/base/udev/ide-floppy.sh:1.2 core/base/udev/ide-floppy.sh:removed
--- core/base/udev/ide-floppy.sh:1.2 Tue Apr 12 02:04:00 2005
+++ core/base/udev/ide-floppy.sh Wed Dec 12 01:20:27 2007
@@ -1,3 +0,0 @@
-#!/bin/sh -e
-/bin/cat /proc/ide/`echo $1 | tr -d "[0-9]"`/media
-exit 0
Index: core/base/udev/ide-modules.sh
diff -u core/base/udev/ide-modules.sh:1.1 core/base/udev/ide-modules.sh:removed
--- core/base/udev/ide-modules.sh:1.1 Tue Jan 24 16:14:20 2006
+++ core/base/udev/ide-modules.sh Wed Dec 12 01:20:27 2007
@@ -1,11 +0,0 @@
-#! /bin/sh
-if [ "`find /proc/ide -noleaf -name 'media'`" ]; then
- for i in $(cat `find /proc/ide -noleaf -name "media"`); do
- case $i in
- cdrom) echo IDE_CDROM="1" ;;
- floppy) echo IDE_FLOPPY="1" ;;
- disk) echo IDE_DISK="1" ;;
- tape) echo IDE_TAPE="1" ;;
- esac
- done
-fi
Index: core/base/udev/ide-storage.sh
diff -u core/base/udev/ide-storage.sh:1.1 core/base/udev/ide-storage.sh:removed
--- core/base/udev/ide-storage.sh:1.1 Tue Apr 12 02:04:00 2005
+++ core/base/udev/ide-storage.sh Wed Dec 12 01:20:27 2007
@@ -1,3 +0,0 @@
-#!/bin/sh -e
-/bin/cat /sys/block/`echo $1 | tr -d "[0-9]"`/removable
-exit 0
Index: core/base/udev/modalias_ieee1394
diff -u core/base/udev/modalias_ieee1394:1.1 core/base/udev/modalias_ieee1394:removed
--- core/base/udev/modalias_ieee1394:1.1 Sat Dec 17 11:07:28 2005
+++ core/base/udev/modalias_ieee1394 Wed Dec 12 01:20:27 2007
@@ -1,8 +0,0 @@
-#!/bin/sh -e
-# this is required for ALL kernels so far
-
-[ "$VENDOR_ID" -a "$MODEL_ID" -a "$SPECIFIER_ID" -a "$VERSION" ] || exit 1
-
-printf "MODALIAS='ieee1394:ven%08Xmo%08Xsp%08Xver%08X'\n" \
- $((0x$VENDOR_ID)) $((0x$MODEL_ID)) $((0x$SPECIFIER_ID)) $((0x$VERSION))
-
Index: core/base/udev/net-persistent.patch
diff -u core/base/udev/net-persistent.patch:1.1 core/base/udev/net-persistent.patch:removed
--- core/base/udev/net-persistent.patch:1.1 Wed Sep 20 12:05:59 2006
+++ core/base/udev/net-persistent.patch Wed Dec 12 01:20:27 2007
@@ -1,37 +0,0 @@
-From: Kay Sievers <kay.sievers at suse.de>
-Date: Sat, 9 Sep 2006 12:45:45 +0000 (+0200)
-Subject: rule_generator: improve net rule comment generation
-X-Git-Url: http://www.kernel.org/git/?p=linux/hotplug/udev.git;a=commitdiff;h=8091f6a90ccca1dd86271aec3441b01c2af4fbd5
-
-rule_generator: improve net rule comment generation
----
-
---- a/extras/rule_generator/75-persistent-net-generator.rules
-+++ b/extras/rule_generator/75-persistent-net-generator.rules
-@@ -1,16 +1,19 @@
- # these rules generate rules for persistent network device naming
-
--ACTION=="add", SUBSYSTEM=="net", NAME!="?*", DRIVERS=="?*", GOTO="persistent_net_generator_do"
--GOTO="persistent_net_generator_end"
-+ACTION=="add", SUBSYSTEM=="net", KERNEL=="eth*|ath*|wlan*|ra*|sta*" \
-+ NAME!="?*", DRIVERS=="?*", GOTO="persistent_net_generator_do"
-
-+GOTO="persistent_net_generator_end"
- LABEL="persistent_net_generator_do"
--# export device description to comment the generated rule
--SUBSYSTEMS=="pci", ENV{COMMENT}="PCI Device: $attr{vendor}:$attr{device} ($attr{driver})"
--SUBSYSTEMS=="usb", ENV{COMMENT}="USB Device: 0x$attr{idVendor}:0x$attr{idProduct} ($attr{driver})"
--SUBSYSTEMS=="ieee1394", ENV{COMMENT}="Firewire Device: $attr{host_id} ($attr{driver})"
-+
-+# build device description string to add a comment the generated rule
-+SUBSYSTEMS=="pci", ENV{COMMENT}="PCI device $attr{vendor}:$attr{device} ($attr{driver})"
-+SUBSYSTEMS=="usb", ENV{COMMENT}="USB device 0x$attr{idVendor}:0x$attr{idProduct} ($attr{driver})"
-+SUBSYSTEMS=="ieee1394", ENV{COMMENT}="Firewire device $attr{host_id})"
- SUBSYSTEMS=="xen", ENV{COMMENT}="Xen virtual device"
-+ENV{COMMENT}=="", ENV{COMMENT}="$env{SUBSYSTEM} device ($attr{driver})"
-
--KERNEL=="eth*|ath*|wlan*|ra*|sta*", IMPORT{program}="write_net_rules $attr{address}"
-+IMPORT{program}="write_net_rules $attr{address}"
- ENV{INTERFACE_NEW}=="?*", NAME="$env{INTERFACE_NEW}"
-
- LABEL="persistent_net_generator_end"
Index: core/base/udev/path_id.patch
diff -u core/base/udev/path_id.patch:1.1 core/base/udev/path_id.patch:removed
--- core/base/udev/path_id.patch:1.1 Thu Dec 1 04:27:35 2005
+++ core/base/udev/path_id.patch Wed Dec 12 01:20:27 2007
@@ -1,14 +0,0 @@
---- extras/path_id~ 2005-08-18 19:04:49.000000000 +0200
-+++ extras/path_id 2005-12-01 10:03:57.000000000 +0100
-@@ -55,9 +55,9 @@
- # then firewire sbp2
- # then the rest
-
--PATH=/lib/klibc/bin #/usr:/usr/sbin:/usr/bin:/sbin:/bin
-+#PATH=/lib/klibc/bin #/usr:/usr/sbin:/usr/bin:/sbin:/bin
- SYSFS=/sys
--export PATH
-+#export PATH
- RESULT=1
- CDROM=
- TYPE=
Index: core/base/udev/post-107.patch
diff -u core/base/udev/post-107.patch:1.1 core/base/udev/post-107.patch:removed
--- core/base/udev/post-107.patch:1.1 Sun Mar 25 02:59:13 2007
+++ core/base/udev/post-107.patch Wed Dec 12 01:20:27 2007
@@ -1,176 +0,0 @@
-From: Matthias Schwarzott <zzam at gentoo.org>
-Date: Thu, 22 Mar 2007 20:05:56 +0000 (+0100)
-Subject: write_cd_rules: set default link type to "by-id" for usb and ieee1394 devices
-X-Git-Url: http://git.kernel.org/?p=linux%2Fhotplug%2Fudev.git;a=commitdiff_plain;h=491a6a71ff685373422621f4b67f550806072d17
-
-write_cd_rules: set default link type to "by-id" for usb and ieee1394 devices
----
-
-diff --git a/extras/rule_generator/write_cd_rules b/extras/rule_generator/write_cd_rules
-index 1dbe6b7..bd951c5 100644
---- a/extras/rule_generator/write_cd_rules
-+++ b/extras/rule_generator/write_cd_rules
-@@ -53,7 +53,15 @@ fi
- if [ "$1" ]; then
- METHOD="$1"
- else
-- METHOD='by-path'
-+ case "$ID_BUS" in
-+ usb|ieee1394)
-+ METHOD='by-id'
-+ ;;
-+
-+ *)
-+ METHOD='by-path'
-+ ;;
-+ esac
- fi
-
- case "$METHOD" in
-From: Kay Sievers <kay.sievers at vrfy.org>
-Date: Fri, 23 Mar 2007 16:17:18 +0000 (+0100)
-Subject: udevinfo: relax check for the correct device if looked up by name
-X-Git-Url: http://git.kernel.org/?p=linux%2Fhotplug%2Fudev.git;a=commitdiff_plain;h=be8594ab14f15203fcea4b2aa0115171472f3e43
-
-udevinfo: relax check for the correct device if looked up by name
----
-
-diff --git a/udev_db.c b/udev_db.c
-index 00d68d6..7b8d02b 100644
---- a/udev_db.c
-+++ b/udev_db.c
-@@ -186,7 +186,7 @@ int udev_db_get_device(struct udevice *udev, const char *devpath)
- size_t cur;
- size_t count;
-
-- strlcpy(udev->dev->devpath, devpath, sizeof(udev->dev->devpath));
-+ sysfs_device_set_values(udev->dev, devpath, NULL, NULL);
- devpath_to_db_path(devpath, filename, sizeof(filename));
-
- if (lstat(filename, &stats) != 0) {
-diff --git a/udevinfo.c b/udevinfo.c
-index 3f25be0..4b4876c 100644
---- a/udevinfo.c
-+++ b/udevinfo.c
-@@ -173,13 +173,17 @@ static void export_db(void) {
- static int lookup_device_by_name(struct udevice *udev, const char *name)
- {
- LIST_HEAD(name_list);
-+ int count;
- struct name_entry *device;
- int rc = -1;
-
-- if (udev_db_get_devices_by_name(name, &name_list) <= 0)
-+ count = udev_db_get_devices_by_name(name, &name_list);
-+ if (count <= 0)
- goto out;
-
-- /* select the device that matches the dev_t of name */
-+ info("found %i devices for '%s'", count, name);
-+
-+ /* select the device that seems to match */
- list_for_each_entry(device, &name_list, node) {
- char filename[PATH_SIZE];
- struct stat statbuf;
-@@ -189,16 +193,18 @@ static int lookup_device_by_name(struct udevice *udev, const char *name)
- continue;
- info("found db entry '%s'", device->name);
-
-+ /* make sure, we don't get a link of a differnt device */
- strlcpy(filename, udev_root, sizeof(filename));
- strlcat(filename, "/", sizeof(filename));
- strlcat(filename, name, sizeof(filename));
- if (stat(filename, &statbuf) != 0)
- continue;
-- if (statbuf.st_rdev == udev->devt) {
-- info("found '%s', dev_t matches", udev->name);
-- rc = 0;
-- break;
-+ if (major(udev->devt) > 0 && udev->devt != statbuf.st_rdev) {
-+ info("skip '%s', dev_t doesn't match", udev->name);
-+ continue;
- }
-+ rc = 0;
-+ break;
- }
- out:
- name_list_cleanup(&name_list);
-From: Kay Sievers <kay.sievers at vrfy.org>
-Date: Fri, 23 Mar 2007 16:18:03 +0000 (+0100)
-Subject: don't write to sysfs files during test run
-X-Git-Url: http://git.kernel.org/?p=linux%2Fhotplug%2Fudev.git;a=commitdiff_plain;h=d2c9a56e0e624ed448aed8ad18460deed63973e1
-
-don't write to sysfs files during test run
----
-
-diff --git a/udev_rules.c b/udev_rules.c
-index f8844a8..5078f2d 100644
---- a/udev_rules.c
-+++ b/udev_rules.c
-@@ -861,8 +861,9 @@ try_parent:
- info("writing '%s' to sysfs file '%s'", value, attr);
- f = fopen(attr, "w");
- if (f != NULL) {
-- if (fprintf(f, "%s", value) <= 0)
-- err("error writing ATTR{%s}: %s", attr, strerror(errno));
-+ if (!udev->test_run)
-+ if (fprintf(f, "%s", value) <= 0)
-+ err("error writing ATTR{%s}: %s", attr, strerror(errno));
- fclose(f);
- } else
- err("error opening ATTR{%s} for writing: %s", attr, strerror(errno));
-From: Pozsar Balazs <pozsy at uhulinux.hu>
-Date: Fri, 23 Mar 2007 16:21:46 +0000 (+0100)
-Subject: udevsettle: read udev not kernel seqnum first
-X-Git-Url: http://git.kernel.org/?p=linux%2Fhotplug%2Fudev.git;a=commitdiff_plain;h=4e2b290821d083361260f8cdbe7c54886463673e
-
-udevsettle: read udev not kernel seqnum first
----
-
-diff --git a/udevsettle.c b/udevsettle.c
-index 9e3e03b..f76ad71 100644
---- a/udevsettle.c
-+++ b/udevsettle.c
-@@ -110,9 +110,9 @@ int main(int argc, char *argv[], char *envp[])
- goto exit;
- }
-
-- /* read current kernel seqnum */
-- strlcpy(filename, sysfs_path, sizeof(filename));
-- strlcat(filename, "/kernel/uevent_seqnum", sizeof(filename));
-+ /* read current udev seqnum */
-+ strlcpy(filename, udev_root, sizeof(filename));
-+ strlcat(filename, "/" EVENT_SEQNUM, sizeof(filename));
- fd = open(filename, O_RDONLY);
- if (fd < 0)
- goto exit;
-@@ -121,12 +121,12 @@ int main(int argc, char *argv[], char *envp[])
- if (len <= 0)
- goto exit;
- seqnum[len] = '\0';
-- seq_kernel = strtoull(seqnum, NULL, 10);
-- info("kernel seqnum = %llu", seq_kernel);
-+ seq_udev = strtoull(seqnum, NULL, 10);
-+ info("udev seqnum = %llu", seq_udev);
-
-- /* read current udev seqnum */
-- strlcpy(filename, udev_root, sizeof(filename));
-- strlcat(filename, "/" EVENT_SEQNUM, sizeof(filename));
-+ /* read current kernel seqnum */
-+ strlcpy(filename, sysfs_path, sizeof(filename));
-+ strlcat(filename, "/kernel/uevent_seqnum", sizeof(filename));
- fd = open(filename, O_RDONLY);
- if (fd < 0)
- goto exit;
-@@ -135,8 +135,8 @@ int main(int argc, char *argv[], char *envp[])
- if (len <= 0)
- goto exit;
- seqnum[len] = '\0';
-- seq_udev = strtoull(seqnum, NULL, 10);
-- info("udev seqnum = %llu", seq_udev);
-+ seq_kernel = strtoull(seqnum, NULL, 10);
-+ info("kernel seqnum = %llu", seq_kernel);
-
- /* make sure all kernel events have arrived in the queue */
- if (seq_udev >= seq_kernel) {
-
Index: core/base/udev/scsi-devfs.sh
diff -u core/base/udev/scsi-devfs.sh:1.1 core/base/udev/scsi-devfs.sh:removed
--- core/base/udev/scsi-devfs.sh:1.1 Fri May 27 00:18:41 2005
+++ core/base/udev/scsi-devfs.sh Wed Dec 12 01:20:27 2007
@@ -1,81 +0,0 @@
-#!/bin/sh -e
-# Inspired from a script by Remco <remco at d-compu.dyndns.org>.
-# Support for /dev/discs/* and /dev/cdroms/* by Daniel Mueller <danm at gmx.li>.
-#
-# BUS="scsi", KERNEL="sd[a-z][0-9]*", PROGRAM="/etc/udev/scsi-devfs.sh %k %b %n", NAME="%1c", SYMLINK="%k %2c"
-
-get_ide_offset() {
- local num=0
- local dev
-
- for dev in /proc/ide/*/media; do
- if [ "`cat $dev`" = "$1" ]; then
- num=$(($num + 1))
- fi
- done
-
- echo $num
-}
-
-get_next_number() {
- local num=0
- local dev
- local offset=`get_ide_offset $2`
-
- if [ "$2" = "disk" ]; then
- local DRIVE="${1%%[0-9]*}"
- local DEVLIST="/sys/block/sd*"
- else
- local DRIVE=$1
- local DEVLIST="/sys/block/sr*"
- fi
-
- for dev in $DEVLIST; do
- [ "${dev#/sys/block/}" = "$DRIVE" ] && break
- num=$(($num + 1))
- done
-
- echo $(($offset + $num))
-}
-
-# the format is "HOST:BUS:TARGET:LUN"
-SCSI_ID=$2
-HOST=${SCSI_ID%%:*}
-SCSI_ID=${SCSI_ID#*:}
-BUS=${SCSI_ID%%:*}
-SCSI_ID=${SCSI_ID#*:}
-TARGET=${SCSI_ID%%:*}
-SCSI_ID=${SCSI_ID#*:}
-LUN=$SCSI_ID
-
-case "$1" in
-scd*|sr*)
- # CDROM/DVD
- NAME=cd
- LINK="cdroms/cdrom"`get_next_number $1 cdrom`
- ;;
-sd*)
- if [ "$3" ]; then
- NAME=part$3
- LINK="discs/disc"`get_next_number $1 disk`/part${3}
- else
- NAME=disc
- LINK="discs/disc"`get_next_number $1 disk`/disc
- fi
- ;;
-nst*)
- NAME=$(echo "$1" | sed -e 's/nst0m/nmt/')
- [ $NAME = "mt0" ] && LINK=ntape
- ;;
-st*)
- NAME=$(echo "$1" | sed -e 's/st0m/mt/')
- [ $NAME = "mt0" ] && LINK=tape
- ;;
-sg*|*)
- NAME=generic
- ;;
-esac
-
-echo scsi/host$HOST/bus$BUS/target$TARGET/lun$LUN/$NAME $LINK
-
-exit 0
Index: core/base/udev/udev.patch
diff -u core/base/udev/udev.patch:1.2 core/base/udev/udev.patch:removed
--- core/base/udev/udev.patch:1.2 Tue Nov 29 14:32:16 2005
+++ core/base/udev/udev.patch Wed Dec 12 01:20:27 2007
@@ -1,19 +0,0 @@
-diff -Naur udev-076-orig/extras/start_udev udev-058/extras/start_udev
---- udev-076-orig/extras/start_udev 2005-05-20 13:18:28.000000000 -0700
-+++ udev-076/extras/start_udev 2005-11-29 10:26:35.000000000 -0700
-@@ -98,5 +98,15 @@
- echo "making extra nodes"
- make_extra_nodes
-
-+# check if udevd is already running
-+if [ `pidof -o %PPID /sbin/udevd` ]; then
-+ grep -v "/dev/shm" /etc/mtab | grep -v "/dev/pts" > /etc/mtab
-+ mount /dev/pts
-+ mount /dev/shm
-+else
-+ echo "start udev daemon"
-+ /sbin/udevd --daemon
-+fi
-+
- echo "udev startup is finished!"
- exit 0
Index: core/base/udev/udev.permissions
diff -u core/base/udev/udev.permissions:1.7 core/base/udev/udev.permissions:removed
--- core/base/udev/udev.permissions:1.7 Thu Feb 3 15:49:07 2005
+++ core/base/udev/udev.permissions Wed Dec 12 01:20:27 2007
@@ -1,205 +0,0 @@
-# /etc/udev/udev.permissions: permission/ownership map for udev
-
-# console devices
-console:root:tty:0600
-tty[0-9][0-9]*:root:tty:0660
-vc/[0-9]*:root:tty:0660
-
-# pty devices
-# Set this to 0660 if you only want users belonging to tty group
-# to be able to allocate PTYs
-ptmx:root:tty:0666
-pty[p-za-e][0-9a-f]*:root:tty:0660
-tty[p-za-e][0-9a-f]*:root:tty:0660
-pty/m*:root:tty:0660
-vc/s*:root:tty:0660
-
-# serial+dialup devices
-ttyS*:root:tty:0660
-ippp*:root:tty:0660
-isdn*:root:tty:0660
-isdnctrl*:root:tty:0660
-capi*:root:tty:0660
-dcbri*:root:tty:0660
-ircomm*:root:tty:0660
-ttyUSB*:root:tty:0660
-tts/[0-9]*:root:tty:0660
-tts/USB[0-9]*:root:tty:0660
-
-# vc devices
-vcs:root:root:0600
-vcs[0-9]*:root:root:0600
-vcsa:root:root:0600
-vcsa[0-9]*:root:root:0600
-vcc/*:root:root:0600
-
-# memory devices
-random:root:root:0666
-urandom:root:root:0444
-mem:root:kmem:0640
-kmem:root:kmem:0640
-port:root:kmem:0640
-tty:root:root:0666
-full:root:root:0666
-null:root:root:0666
-zero:root:root:0666
-
-# misc devices
-misc/psaux:root:root:0660
-misc/nvram:root:root:0660
-misc/rtc:root:audio:0664
-
-# floppy devices
-fd[01]*:root:floppy:0660
-
-# audio devices
-dsp*:root:audio:0660
-audio*:root:audio:0660
-midi*:root:audio:0660
-mixer*:root:audio:0660
-sequencer*:root:audio:0660
-sound/*:root:audio:0660
-snd/*:root:audio:0660
-beep:root:audio:0660
-admm*:root:audio:0660
-adsp*:root:audio:0660
-aload*:root:audio:0660
-amidi*:root:audio:0660
-dmfm*:root:audio:0660
-dmmidi*:root:audio:0660
-sndstat:root:audio:0660
-
-# optical devices
-sr*:root:optical:660
-scd*:root:optical:660
-pcd*:root:optical:0660
-cdrom*:root:optical:0660
-dvd:root:optical:0660
-rdvd:root:optical:0660
-cdroms/*:root:optical:0660
-
-# pilot/palm devices
-pilot:root:root:0660
-
-# jaz devices
-jaz*:root:storage:0660
-
-# zip devices
-pocketzip*:root:storage:0660
-zip*:root:storage:0660
-
-# ls120 devices
-ls120:root:storage:0660
-ls120*:root:storage:0660
-
-# lp devices
-lp*:root:lp:0660
-parport*:root:lp:0660
-irlpt*:root:lp:0660
-usblp*:root:lp:0660
-usb/lp*:root:lp:0660
-
-# scanner devices
-scanner:root:scanner:0660
-usb/scanner*:root:scanner:0660
-
-# camera devices
-camera*:root:root:0600
-usb/dc2xx*:root:root:0600
-usb/mdc800*:root:root:0600
-
-# raw devices
-ram*:root:disk:660
-raw/*:root:disk:660
-
-# disk devices
-hd*:root:disk:660
-sd*:root:disk:660
-dasd*:root:disk:660
-ataraid*:root:disk:660
-loop*:root:disk:660
-md*:root:disk:660
-ide/*/*/*/*/*:root:disk:660
-discs/*/*:root:disk:660
-loop/*:root:disk:660
-md/*:root:disk:660
-
-# tape devices
-ht*:root:root:0660
-nht*:root:root:0660
-pt[0-9]*:root:root:0660
-npt*:root:root:0660
-st*:root:root:0660
-nst*:root:root:0660
-
-# dm devices
-dm-*:root:root:0640
-
-# memstick devices
-memstick*:root:root:0600
-
-# flash devices
-flash*:root:root:0600
-
-# diskonkey devices
-diskonkey*:root:disk:0660
-
-# rem_ide devices
-microdrive*:root:disk:0660
-
-# fb devices
-fb:root:video:0660
-fb[0-9]*:root:video:0660
-fb/*:root:video:0660
-
-# kbd devices
-kbd:root:root:0644
-
-# joystick devices
-js[0-9]*:root:root:0644
-djs[0-9]*:root:root:0644
-
-# v4l devices
-video*:root:video:0660
-radio*:root:video:0660
-winradio*:root:video:0660
-vtx*:root:video:0660
-vbi*:root:video:0660
-video/*:root:video:0660
-vttuner:root:video:0660
-v4l/*:root:video:0660
-
-# input devices
-input/*:root:root:644
-
-# gpm devices
-gpmctl:root:root:0700
-
-# dri devices
-radeon*:root:users:0660
-i810*:root:users:0660
-i830*:root:users:0660
-i915*:root:users:0660
-mga*:root:users:0660
-r128*:root:users:0660
-sis*:root:users:0660
-tdfx*:root:users:0660
-nvidia*:root:users:0660
-3dfx*:root:users:0660
-dri/*:root:users:0660
-
-# mainboard devices
-apm_bios:root:root:0600
-
-# scsi devices
-sg*:root:disk:0660
-pg*:root:disk:0660
-
-# usb devices
-usb/dabusb*:root:root:0660
-usb/mdc800*:root:root:0660
-usb/rio500:root:root:0660
-
-sgi_fetchop:root:root:666
-iseries/vcd*:root:disk:660
-iseries/vd*:root:disk:660
Index: core/base/udev/udevtrigger-ordering.patch
diff -u core/base/udev/udevtrigger-ordering.patch:1.1 core/base/udev/udevtrigger-ordering.patch:removed
--- core/base/udev/udevtrigger-ordering.patch:1.1 Sun Apr 9 03:06:59 2006
+++ core/base/udev/udevtrigger-ordering.patch Wed Dec 12 01:20:27 2007
@@ -1,36 +0,0 @@
-diff --git a/udevtrigger.c b/udevtrigger.c
-index bc8453a..49d6b9c 100644
---- a/udevtrigger.c
-+++ b/udevtrigger.c
-@@ -36,6 +36,7 @@
- static const char *udev_log_str;
- static int verbose;
- static int dry_run;
-+static int sysfs_path_length;
-
- #ifdef USE_LOG
- void log_message(int priority, const char *format, ...)
-@@ -77,13 +78,13 @@ static int device_list_insert(const char
- int i;
-
- for (i = 0; first_list[i] != NULL; i++) {
-- if (strncmp(path, first_list[i], strlen(first_list[i])) == 0) {
-+ if (strncmp(path+sysfs_path_length, first_list[i], strlen(first_list[i])) == 0) {
- device_list = &device_first_list;
- break;
- }
- }
- for (i = 0; last_list[i] != NULL; i++) {
-- if (strncmp(path, last_list[i], strlen(last_list[i])) == 0) {
-+ if (strncmp(path+sysfs_path_length, last_list[i], strlen(last_list[i])) == 0) {
- device_list = &device_last_list;
- break;
- }
-@@ -341,6 +342,7 @@ int main(int argc, char *argv[], char *e
- }
-
- sysfs_init();
-+ sysfs_path_length=strlen(sysfs_path);
-
- udev_scan_bus();
- udev_scan_class();
Index: core/base/udev/usb-storage.sh
diff -u core/base/udev/usb-storage.sh:1.1 core/base/udev/usb-storage.sh:removed
--- core/base/udev/usb-storage.sh:1.1 Mon Feb 14 16:35:09 2005
+++ core/base/udev/usb-storage.sh Wed Dec 12 01:20:27 2007
@@ -1,3 +0,0 @@
-#!/bin/sh -e
-/bin/cat /sys/block/`echo $1 | tr -d "[0-9]"`/removable
-exit 0
Index: core/base/udev/usb_id-fix.patch
diff -u core/base/udev/usb_id-fix.patch:1.1 core/base/udev/usb_id-fix.patch:removed
--- core/base/udev/usb_id-fix.patch:1.1 Thu Oct 18 05:21:48 2007
+++ core/base/udev/usb_id-fix.patch Wed Dec 12 01:20:27 2007
@@ -1,107 +0,0 @@
-From: Kay Sievers <kay.sievers at vrfy.org>
-Date: Mon, 15 Oct 2007 18:38:20 +0000 (+0200)
-Subject: usb_id: fail if vendor/product can not be retrieved
-X-Git-Url: http://git.kernel.org/?p=linux%2Fhotplug%2Fudev.git;a=commitdiff_plain;h=963033472f8d2aab0bf77147b916de8f3b0b5450
-
-usb_id: fail if vendor/product can not be retrieved
-
-Thanks to Daniel Drake for identifying the bug.
----
-
-diff --git a/extras/usb_id/usb_id.c b/extras/usb_id/usb_id.c
-index d36a27b..5fb030d 100644
---- a/extras/usb_id/usb_id.c
-+++ b/extras/usb_id/usb_id.c
-@@ -1,7 +1,5 @@
- /*
-- * usb_id.c
-- *
-- * Identify an USB (block) device
-+ * usb_id - identify an USB device
- *
- * Copyright (c) 2005 SUSE Linux Products GmbH, Germany
- *
-@@ -224,8 +222,6 @@ static int usb_id(const char *devpath)
- struct sysfs_device *dev;
- struct sysfs_device *dev_interface;
- struct sysfs_device *dev_usb;
-- const char *scsi_model, *scsi_vendor, *scsi_type, *scsi_rev;
-- const char *usb_model = NULL, *usb_vendor = NULL, *usb_rev, *usb_serial;
- const char *if_class, *if_subclass;
- int if_class_num;
- int protocol = 0;
-@@ -271,6 +267,7 @@ static int usb_id(const char *devpath)
- /* mass storage */
- if (protocol == 6 && !use_usb_info) {
- struct sysfs_device *dev_scsi;
-+ const char *scsi_model, *scsi_vendor, *scsi_type, *scsi_rev;
- int host, bus, target, lun;
-
- /* get scsi device */
-@@ -321,40 +318,50 @@ static int usb_id(const char *devpath)
- }
-
- fallback:
-- /* Fallback to USB vendor & device */
-+ /* fallback to USB vendor & device */
- if (vendor_str[0] == '\0') {
-+ const char *usb_vendor = NULL;
-+
- if (!use_num_info)
-- if (!(usb_vendor = sysfs_attr_get_value(dev_usb->devpath, "manufacturer")))
-- dbg("No USB vendor string found, using idVendor");
-+ usb_vendor = sysfs_attr_get_value(dev_usb->devpath, "manufacturer");
-+
-+ if (!usb_vendor)
-+ usb_vendor = sysfs_attr_get_value(dev_usb->devpath, "idVendor");
-
- if (!usb_vendor) {
-- if (!(usb_vendor = sysfs_attr_get_value(dev_usb->devpath, "idVendor"))) {
-- dbg("No USB vendor information available\n");
-- sprintf(vendor_str,"0000");
-- }
-+ info("No USB vendor information available");
-+ return 1;
- }
-- set_str(vendor_str,usb_vendor, sizeof(vendor_str) - 1);
-+ set_str(vendor_str, usb_vendor, sizeof(vendor_str)-1);
- }
--
-+
- if (model_str[0] == '\0') {
-+ const char *usb_model = NULL;
-+
- if (!use_num_info)
-- if (!(usb_model = sysfs_attr_get_value(dev_usb->devpath, "product")))
-- dbg("No USB model string found, using idProduct");
--
-+ usb_model = sysfs_attr_get_value(dev_usb->devpath, "product");
-+
-+ if (!usb_model)
-+ usb_model = sysfs_attr_get_value(dev_usb->devpath, "idProduct");
-+
- if (!usb_model) {
-- if (!(usb_model = sysfs_attr_get_value(dev_usb->devpath, "idProduct")))
-- dbg("No USB model information available\n"); sprintf(model_str,"0000");
-+ dbg("No USB model information available");
-+ return 1;
- }
-- set_str(model_str, usb_model, sizeof(model_str) - 1);
-+ set_str(model_str, usb_model, sizeof(model_str)-1);
- }
-
- if (revision_str[0] == '\0') {
-+ const char *usb_rev;
-+
- usb_rev = sysfs_attr_get_value(dev_usb->devpath, "bcdDevice");
- if (usb_rev)
- set_str(revision_str, usb_rev, sizeof(revision_str)-1);
- }
-
- if (serial_str[0] == '\0') {
-+ const char *usb_serial;
-+
- usb_serial = sysfs_attr_get_value(dev_usb->devpath, "serial");
- if (usb_serial)
- set_str(serial_str, usb_serial, sizeof(serial_str)-1);
-
More information about the arch-commits
mailing list