rpms/udev/FC-3 MAKEDEV.dev, 1.2, 1.3 Makefile, 1.2, 1.3 ide-media.sh, 1.3, 1.4 pam_console.dev, 1.9, 1.10 sources, 1.18, 1.19 start_udev, 1.33, 1.34 udev-039-static.patch, 1.3, 1.4 udev.conf, 1.15, 1.16 udev.html, 1.4, 1.5 udev.permissions, 1.7, 1.8 udev.rules, 1.24, 1.25 udev.rules.persistent, 1.5, 1.6 udev.spec, 1.75, 1.76
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Fri Oct 7 13:26:03 UTC 2005
- Previous message (by thread): rpms/passwd/devel .cvsignore, 1.13, 1.14 passwd.spec, 1.17, 1.18 sources, 1.15, 1.16
- Next message (by thread): rpms/sysstat/devel .cvsignore, 1.11, 1.12 sources, 1.11, 1.12 sysstat-4.0.1-config.patch, 1.1, 1.2 sysstat.spec, 1.29, 1.30 sysstat-4.0.7-lib64.patch, 1.1, NONE sysstat-5.0.0-history.patch, 1.1, NONE sysstat-5.0.5-debug.patch, 1.1, NONE sysstat-5.0.5-filename.patch, 1.1, NONE sysstat-5.0.5-gcc4fix.patch, 1.1, NONE sysstat-5.0.5-lib64init.patch, 1.2, NONE sysstat-5.0.5-overrun.patch, 1.1, NONE sysstat-5.0.5-statreset.patch, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: harald
Update of /cvs/dist/rpms/udev/FC-3
In directory cvs.devel.redhat.com:/tmp/cvs-serv30132
Modified Files:
MAKEDEV.dev Makefile ide-media.sh pam_console.dev sources
start_udev udev-039-static.patch udev.conf udev.html
udev.permissions udev.rules udev.rules.persistent udev.spec
Log Message:
added the detach_state patch from Alan Stern (bug #163438)
Index: MAKEDEV.dev
===================================================================
RCS file: /cvs/dist/rpms/udev/FC-3/MAKEDEV.dev,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- MAKEDEV.dev 1 Aug 2005 16:55:10 -0000 1.2
+++ MAKEDEV.dev 7 Oct 2005 13:25:59 -0000 1.3
@@ -27,7 +27,7 @@
fi
debug_mesg () {
- test -z "$udev_log" -o "$udev_log" != "1" && return
+ test "$udev_log" = "" -o "$udev_log" = "no" && return
mesg "$@"
}
Index: Makefile
===================================================================
RCS file: /cvs/dist/rpms/udev/FC-3/Makefile,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Makefile 1 Aug 2005 16:55:10 -0000 1.2
+++ Makefile 7 Oct 2005 13:25:59 -0000 1.3
@@ -2,6 +2,5 @@
# $Id$
NAME := udev
SPECFILE = $(firstword $(wildcard *.spec))
-UPSTREAM_CHECKS = sign
include ../common/Makefile.common
Index: ide-media.sh
===================================================================
RCS file: /cvs/dist/rpms/udev/FC-3/ide-media.sh,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ide-media.sh 1 Aug 2005 16:55:10 -0000 1.3
+++ ide-media.sh 7 Oct 2005 13:25:59 -0000 1.4
@@ -1,4 +1,10 @@
#!/bin/bash
+
+if [ -a /proc/ide/$1/media ] ; then
+ /bin/cat /proc/ide/$1/media
+ exit 0
+fi
+
i=0
while [[ ! -a /proc/ide/$1/media && $i -lt 10 ]]; do
/bin/usleep 100000;
Index: pam_console.dev
===================================================================
RCS file: /cvs/dist/rpms/udev/FC-3/pam_console.dev,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- pam_console.dev 1 Aug 2005 16:55:10 -0000 1.9
+++ pam_console.dev 7 Oct 2005 13:25:59 -0000 1.10
@@ -29,7 +29,7 @@
fi
debug_mesg () {
- test -z "$udev_log" -o "$udev_log" != "yes" && return
+ test "$udev_log" = "" -o "$udev_log" = "no" && return
mesg "$@"
}
@@ -38,9 +38,9 @@
fi
SYMLINKS=""
- for i in $(/usr/bin/udevinfo -r -q symlink -p "$DEVPATH"); do
+ for i in $(/usr/bin/udevinfo -q symlink -p "$DEVPATH"); do
[ $? -gt 0 ] && break
- SYMLINKS="$SYMLINKS $i"
+ SYMLINKS="$SYMLINKS ${udev_root%%/}/$i"
done
debug_mesg "Restoring console permissions for $DEVNAME $SYMLINKS"
/sbin/pam_console_setowner "$DEVNAME" $SYMLINKS
Index: sources
===================================================================
RCS file: /cvs/dist/rpms/udev/FC-3/sources,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- sources 2 Aug 2005 09:36:17 -0000 1.18
+++ sources 7 Oct 2005 13:25:59 -0000 1.19
@@ -1,2 +1,2 @@
b9b6de70e26abb02c026296e9fbea25b pam_console_setowner-1.4.tgz
-03be2f56cc13c7f24b0ebf296166d48a udev-058.tar.bz2
+8a248b0c672e06b9c399c6e31471c922 udev-039.tar.gz
Index: start_udev
===================================================================
RCS file: /cvs/dist/rpms/udev/FC-3/start_udev,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- start_udev 1 Aug 2005 16:55:10 -0000 1.33
+++ start_udev 7 Oct 2005 13:25:59 -0000 1.34
@@ -23,6 +23,8 @@
# don't use udev if sysfs is not mounted.
sysfs_dir=/sys
+TZ=/etc/localtime
+export TZ
[ -d $sysfs_dir/class ] || exit 1
[ -r /proc/mounts ] || exit 1
@@ -37,33 +39,6 @@
udevd=/sbin/udevd
MAKEDEV="/sbin/MAKEDEV"
-xargs_simple () {
- if [ "$1" = "-n" ]; then
- shift
- MAXNR="$1"
- shift
- else
- MAXNR=100
- fi
- NR=$MAXNR
- ARGS=""
- [ -z "$1" ] && set echo
-
- while read line; do
- if [ $NR -gt 0 ]; then
- ARGS="$ARGS $line"
- NR=$[$NR - 1]
- else
- "$@" $ARGS
- NR=$MAXNR
- ARGS="$line"
- fi
- done
- if [ -n "$ARGS" ]; then
- "$@" $ARGS
- fi
-}
-
make_extra_nodes () {
ln -snf /proc/self/fd $udev_root/fd
ln -snf /proc/self/fd/0 $udev_root/stdin
@@ -73,25 +48,23 @@
[ -d $udev_root/pts ] || mkdir -m 0755 $udev_root/pts
[ -d $udev_root/shm ] || mkdir -m 0755 $udev_root/shm
- [ -a /dev/MAKEDEV ] || ln -s $MAKEDEV /dev/MAKEDEV;
if [ -x $MAKEDEV ]; then
- for i in /etc/udev/makedev.d/*.nodes; do
- if [ -f "$i" ]; then
- cat "$i" | sed -e 's,#.*,,g' | \
- xargs_simple -n 100 $MAKEDEV -x
- fi
- done
- fi
- pushd /etc/udev/devices &> "$udev_root/null"
- set *
- if [ "$1" != "*" ]; then
- cp -ar "$@" $udev_root/
- pushd "$udev_root" &> "$udev_root/null"
- [ -x /sbin/restorecon ] && /sbin/restorecon "$@"
- popd &> "$udev_root/null"
+ $MAKEDEV -x $(
+ for i in 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15; do
+ echo cpu/$i/microcode;
+ done;
+ for i in 1 2 3 4 5 6; do echo tty$i;done;
+ for i in 0 1 2 3 4 5 6 7; do echo loop$i; done;
+ for i in 0 1 2 3; do echo lp$i; echo parport$i;done;
+ echo net/tun ppp console null zero;
+ for i in 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 \
+ 16 17 18 19 20 21 22 23 24 25 26 27 28 29 \
+ 30 31; do echo md$i;done;
+ );
+ [ -a /dev/MAKEDEV ] || ln -s $MAKEDEV /dev/MAKEDEV;
+ cp -a /etc/udev/devices/* /dev/ >/dev/null 2>&1 || :
fi
- popd &> "$udev_root/null"
}
# we cannot use /usr/bin/find here
@@ -113,6 +86,7 @@
echo "$found"
}
+
# we cannot use /usr/bin/find here
find_f () {
where=$1
@@ -193,6 +167,7 @@
export ACTION=add
+export UDEV_NO_SLEEP=1
prog=udev
ret=0
STRING=$"Starting $prog: "
@@ -200,37 +175,38 @@
echo -n "$STRING "
# mount the tmpfs on ${udev_root%/}, if not already done
-LANG=C awk "\$2 == \"${udev_root%/}\" && \$3 == \"tmpfs\" { exit 1 }" /proc/mounts && {
+LANG=C fgrep -q "none ${udev_root%/} " /proc/mounts || {
if LANG=C fgrep -q "none ${udev_root%/}/pts " /proc/mounts; then
PTSDIR=$(mktemp -d)
- mount --move $udev_root/pts "$PTSDIR"
+ mount --move /dev/pts "$PTSDIR"
fi
if LANG=C fgrep -q "none ${udev_root%/}/shm " /proc/mounts; then
SHMDIR=$(mktemp -d)
- mount --move $udev_root/shm "$SHMDIR"
+ mount --move /dev/shm "$SHMDIR"
fi
mount -n -o mode=0755 -t tmpfs none "$udev_root"
mkdir -m 0755 $udev_root/pts
mkdir -m 0755 $udev_root/shm
if [ -n "$PTSDIR" ]; then
- mount --move "$PTSDIR" $udev_root/pts
+ mount --move "$PTSDIR" /dev/pts
rmdir "$PTSDIR"
fi
if [ -n "$SHMDIR" ]; then
- mount --move "$SHMDIR" $udev_root/shm
+ mount --move "$SHMDIR" /dev/shm
rmdir "$SHMDIR"
fi
ret=$[$ret + $?]
}
-rm -fr "$udev_db"
+rm -f $udev_root/.udev.tdb
make_extra_nodes
-kill_udevd > "$udev_root/null" 2>&1
-scsi_replay > "$udev_root/null" 2>&1
+kill_udevd >/dev/null 2>&1
+scsi_replay >/dev/null 2>&1
ret=$[$ret + $?]
-ide_scan > "$udev_root/null" 2>&1
-/sbin/udevstart
+kill_udevd >/dev/null 2>&1
+ide_scan >/dev/null 2>&1
+/sbin/udevstart </dev/null >/dev/null 2>&1
ret=$[$ret + $?]
[ $ret -eq 0 ] && success $"$STRING" || failure $"$STRING"
echo
udev-039-static.patch:
udev.h | 18 ++++++++++++++++++
1 files changed, 18 insertions(+)
Index: udev-039-static.patch
===================================================================
RCS file: /cvs/dist/rpms/udev/FC-3/udev-039-static.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- udev-039-static.patch 1 Aug 2005 16:55:10 -0000 1.3
+++ udev-039-static.patch 7 Oct 2005 13:26:00 -0000 1.4
@@ -1,43 +1,25 @@
---- udev-050/udev_add.c.glibcstatic 2004-12-18 06:53:07.000000000 +0100
-+++ udev-050/udev_add.c 2005-02-18 12:19:10.000000000 +0100
-@@ -29,12 +29,15 @@
- #include <errno.h>
- #include <sys/stat.h>
- #include <sys/types.h>
--#include <grp.h>
- #include <net/if.h>
- #include <sys/socket.h>
- #include <sys/ioctl.h>
- #include <linux/sockios.h>
-+
-+#ifndef UDEV_STATIC
- #include <pwd.h>
-+#include <grp.h>
-+#endif
-
- #include "libsysfs/sysfs/libsysfs.h"
- #include "udev.h"
-@@ -46,6 +49,23 @@
-
- #include "selinux.h"
+--- udev-039/udev.h.glibcstatic 2004-10-16 00:08:30.000000000 +0200
++++ udev-039/udev.h 2004-10-18 13:23:14.737756875 +0200
+@@ -90,4 +90,22 @@
+ extern int udev_log;
+ extern int udev_dev_d;
+#ifdef UDEV_STATIC
-+
-+struct passwd { int pw_uid; };
-+struct group { int gr_gid; };
-+
+#undef getpwnam
-+static inline void *getpwnam(const char * name) {
++static inline struct passwd *getpwnam(const char * name) {
+ return NULL;
+}
+
+#undef getgrnam
-+static inline void *getgrnam(const char *name) {
++static inline struct group *getgrnam(const char *name) {
+ return NULL;
+}
+
++#undef getgrent
++static inline struct group *getgrent(void) {
++ return NULL;
++}
++
+#endif
+
- /*
- * the major/minor of a device is stored in a file called "dev"
- * The number is stored in decimal values in the format: M:m
+ #endif
Index: udev.conf
===================================================================
RCS file: /cvs/dist/rpms/udev/FC-3/udev.conf,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- udev.conf 1 Aug 2005 16:55:10 -0000 1.15
+++ udev.conf 7 Oct 2005 13:26:00 -0000 1.16
@@ -1,15 +1,35 @@
# udev.conf
+# The main config file for udev
+#
+# This file can be used to override some of udev's default values
+# for where it looks for files, and where it places device nodes.
#
# WARNING: changing any value, can cause serious system breakage!
+#
+
+# udev_root - where in the filesystem to place the device nodes
+udev_root="/dev/"
+
+# udev_db - The name and location of the udev database.
+udev_db="/dev/.udev.tdb"
+
+# udev_rules - The name and location of the udev rules file
+udev_rules="/etc/udev/rules.d/"
+
+# udev_permissions - The name and location of the udev permission file
+udev_permissions="/etc/udev/permissions.d/"
-# Where in the filesystem to place the device nodes
-udev_root="/dev"
+# default_mode - set the default mode for all nodes that have no
+# explicit match in the permissions file
+default_mode="0600"
-# The name and location of the udev database.
-udev_db="/dev/.udevdb"
+# default_owner - set the default owner for all nodes that have no
+# explicit match in the permissions file
+default_owner="root"
-# The name and location of the udev rules file(s).
-udev_rules="/etc/udev/rules.d"
+# default_group - set the default group for all nodes that have no
+# explicit match in the permissions file
+default_group="root"
-# The syslog(3) priority: "err", "info", or the numerical value.
-udev_log="err"
+# udev_log - set to "yes" if you want logging, else "no"
+udev_log="no"
Index: udev.html
===================================================================
RCS file: /cvs/dist/rpms/udev/FC-3/udev.html,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- udev.html 1 Aug 2005 16:55:10 -0000 1.4
+++ udev.html 7 Oct 2005 13:26:00 -0000 1.5
@@ -2,7 +2,7 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
<html>
<head>
- <title>Fedora Project, sponsored by Red Hat</title>
+ <title>Fedora Project, sponsored by Red Hat: udev on Fedora</title>
<base href="http://fedora.redhat.com/">
<meta http-equiv="Content-Type" content="text/html">
<link rel="stylesheet" type="text/css" media="print" href="/css/print.css">
@@ -53,12 +53,12 @@
<div class="fedora-corner-tr"> </div>
<div class="fedora-corner-tl"> </div>
<div id="fedora-content">
- <!-- content BEGIN -->
+ <!-- content BEGIN -->
<h1>Udev on Fedora</h1>
- <h2>by Harald Hoyer</h2>
<p>
This document tries to reveal the secrets of udev and how it works on Fedora.
</p>
+ <h2>Udev</h2>
<p>
udev was developed by Greg Kroah-Hartman <greg at kroah.com> with much
help from Dan Stekloff <dsteklof at us.ibm.com>, Kay Sievers <kay.sievers at vrfy.org>,
@@ -67,14 +67,12 @@
<p>
The <a href="http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html">udev homepage</a> and the
Linux-hotplug-devel mailing list <a href="https://lists.sourceforge.net/lists/listinfo/linux-hotplug-devel">https://lists.sourceforge.net/lists/listinfo/linux-hotplug-devel</a> are the main development sources.
- </p><p>
- </p>
-
- <h2>What Does Udev Do?</h2>
+ <p>
+ <h2>What does Udev do?</h2>
<p>
udev provides a dynamic device directory containing only the files for
actually present devices. It creates or removes device node files usually
- located in the <tt class="filename">/dev/</tt> directory, or it renames network interfaces.
+ located in the /dev directory, or it renames network interfaces.
</p><p>
As part of the hotplug subsystem, udev is executed if a kernel device
is added or removed from the system. On device creation, udev reads
@@ -86,157 +84,117 @@
file to be deleted.
</p><p>
udev gets called by hotplug, if a module is loaded, and a device is added
- or removed. udev looks in <tt class="filename">/sys/</tt>, if the driver provides a "dev" file, which
+ or removed. udev looks in /sys, if the driver provides a "dev" file, which
contains the major and minor number for a device node to communicate with
- the driver. After looking in the udev rules (in the <tt class="filename">/etc/udev/rules.d/</tt> directory), which
+ the driver. After looking in the udev rules (/etc/udev/rules.d), which
specify the device node filename and symlinks, a device node is created
- in <tt class="filename">/dev/</tt> with the permissions, which are specified in <tt class="filename">/etc/udev/permissions.d/</tt>.
- </p>
+ in /dev with the permissions, which are specified in /etc/udev/permissions.d.
+ </p></p>
After device node creation, removal, or network device renaming, udev
- executes the programs in the directory tree under <tt class="filename">/etc/dev.d/</tt>. The
- name of a program must end with the <tt class="filename">.dev</tt> suffix, to be recognized.
+ executes the programs in the directory tree under /etc/dev.d/. The
+ name of a program must end with .dev suffix, to be recognized.
In addition to the hotplug environment variables, DEVNAME is exported
- to make the name of the created node or the name the network device is
+ to make the name of the created node, or the name the network device is
renamed to, available to the executed program. The programs in every
directory are sorted in lexical order, while the directories are
searched in the following order:
<ul>
- <li><tt class="filename">/etc/dev.d/$(DEVNAME)/*.dev</tt></li>
- <li><tt class="filename">/etc/dev.d/$(SUBSYSTEM)/*.dev</tt></li>
- <li><tt class="filename">/etc/dev.d/default/*.dev</tt></li>
+ <li>/etc/dev.d/$(DEVNAME)/*.dev</li>
+ <li>/etc/dev.d/$(SUBSYSTEM)/*.dev</li>
+ <li>/etc/dev.d/default/*.dev</li>
</ul>
-
- <h2>How is Udev Integrated on Fedora?</h2>
- <h3><tt class="command">initrd</tt> / <tt class="command">initfs</tt></h3>
+ </p>
+ <h2>How is Udev integrated on Fedora?</h2>
+ <h3>initrd / initfs</h3>
<p>
- <tt class="command">mkinitrd</tt> copies <tt class="filename">/sbin/udev.static</tt>
- to the <tt class="command">initrd</tt> <tt class="filename">/sbin/udev</tt> and symlinks it to
- <tt class="filename">/sbin/udevstart</tt>.
+ mkinitrd copies /sbin/udev.static to the initrd /sbin/udev and symlinks it to /sbin/udevstart.
</p><p>
-After the kernel boots, it executes the nash script of the <tt class="command">initrd</tt>. This
-mounts a tmpfs filesystem on <tt class="filename">/dev/</tt>. Instead of hotplug <tt class="command">/sbin/udev</tt> is
-called in the <tt class="command">initrd</tt> phase. udevstart creates all device nodes for the
-devices, which are compiled in the kernel and for the modules, which
-are loaded by nash. </p>
-
-<h4>Problems</h4>
-
-The whole udev and hotplug infrastructure is
-not available in <tt class="command">initrd</tt>. Thus no hotplug scripts, udev rules, and
-permissions and no <tt class="filename">/etc/dev.d/</tt> scripts are executed for any hotplug
-event, which is sent from the kernel.
-
-<h3><tt class="filename">rc.sysinit</tt></h3>
- <p> First, if SELinux is loaded and enabled,
-the context of <tt class="filename">/dev/</tt> is set. <tt class="filename">rc.sysinit</tt> calls <tt class="filename">/sbin/start_udev</tt>.
-<tt class="filename">start_udev</tt> mounts a tmpfs filesystem on <tt class="filename">/dev/</tt>, if there is none already
-mounted. Then it creates some device nodes, which need module
-autoloading, or where there is no kernel module. After that
-<tt class="command">/sbin/udevstart</tt> is called again, which simulates the hotplug events in
-the <tt class="command">initrd</tt> phase, to apply the whole udev rules and permissions. After
-that <tt class="filename">rc.sysinit</tt> parses the ouput of <tt class="filename">/sbin/kmodule</tt> and loads every
-module. This should provide device nodes for all hardware found on your
-computer. </p>
- <h3>Console User Permissions</h3>
- <p>
-<tt class="filename">/etc/dev.d/default/pam_console.dev</tt> is called whenever a device node is
-created and calls <tt class="filename">/sbin/pam_console_setowner</tt> with the filename (and an
-optional symlink) of the device node. This sets the permissions for
-console users like specified in <tt class="filename">/etc/security/console.perms</tt>. </p>
- <h2>Customizing Udev on Fedora</h2>
+ After the kernel boots, it executes the nash script of the initrd. This mounts a tmpfs filesystem on /dev. Instead of hotplug /sbin/udev is called in the initrd phase. udevstart creates all device nodes for the devices, which are compiled in the kernel and for the modules, which are loaded by nash.
+ <h4>Problems</h4>
+ The whole udev and hotplug infrastructure is not available in initrd. Thus no hotplug scripts, udev rules and permissions and no /etc/dev.d scripts are executed for any hotplug event, which is sent from the kernel.
+ </p>
+ <h3>rc.sysinit</h3>
<p>
- Read the manpage of udev and udevinfo.
- Please try not to modify the files of RPM packages.
+ First, if selinux is loaded and enabled, the context of /dev is set. rc.sysinit calls /sbin/start_udev.
+ start_udev mounts a tmpfs filesystem on /dev, if there is none already mounted. Then it creates some device nodes, which need module autoloading, or where there is no kernel module. After that /sbin/udevstart is called again, which simulates the hotplug events in the initrd phase, to apply the whole udev rules and permissions.
+ After that rc.sysinit parses the ouput of /sbin/kmodule and loads every module. This should provide device nodes for all hardware found on your computer.
</p>
- <h3>New Rules</h3>
+ <h3>console user permissions</h3>
<p>
-New rules should be placed in a file, which ends in <tt class="filename">.rules</tt> in
-<tt class="filename">/etc/udev/rules.d/</tt>. Please do not use <tt class="filename">50-udev.rules</tt>. The supported and
-preferred way is to create rules without the "NAME" tag and only
-create "SYMLINK"s. </p><p>
- A nice document describing how to write rules can be found on <a href="http://www.reactivated.net/udevrules.php">http://www.reactivated.net/udevrules.php</a>.
+ /etc/dev.d/default/pam_console.dev is called whenever a device node is created and calls /sbin/pam_console_setowner with the filename (and an optional symlink) of the device node. This sets the permissions for console users like specified in /etc/security/console.perms.
</p>
-
-<h3>Permissions</h3>
-New permissions should be placed in a file, which ends in
-<tt class="filename">.permissions</tt> in <tt class="filename">/etc/udev/permissions.d/</tt>. Please do not use
-<tt class="filename">50-udev.permissions</tt>.
-
-<h3>But I Really Want My Device Node!</h3>
+ <h2>Customizing Udev on Fedora</h2>
<p>
- Put them in <tt class="filename">/etc/udev/devices/</tt>, and they will get copied to <tt class="filename">/dev/</tt>. <a href="https://bugzilla.redhat.com/bugzilla">File a bugzilla entry</a>, if you think that should be done per default.
+ Read the manpage of udev and udevinfo.
+ Please try not to modify the files of rpm packages.
</p>
-
- <h2>Updating to udev Without <tt class="filename">/dev/</tt></h2>
+ <h3>New rules</h3>
+ <p/>
+ New rules should be placed in a file, which ends in ".rules" in /etc/udev/rules.d. Please do not use 50-udev.rules. The supported and preferred way is to create rules without the "NAME" tag, and only create "SYMLINK"s.
+ <p/>
+ A nice document describing, how to write rules can be found on <a href="http://www.reactivated.net/udevrules.php">http://www.reactivated.net/udevrules.php</a>.
+ <h3>Permissions</h3>
+ New permissions should be placed in a file, which ends in ".permissions" in /etc/udev/permissions.d. Please do not use 50-udev.permissions.
+ <h3>But I really want my device node!</h3>
<p>
- The steps to upgrade without Anaconda or a rescue CD are (NOT recommended):
+ Put them in /etc/udev/devices/ and they will get copied to /dev. <a href="https://bugzilla.redhat.com/bugzilla">File a bugzilla entry</a>, if you think that should be done per default.
</p>
-
- <ul>
+ <h2>Updating to udev without /dev</h2>
+ <p>
+ The steps to upgrade without anaconda or a rescue CD are (NOT recommended):
+ <ul>
<li>start from a kernel-2.6
- </li><li>Make sure <tt class="filename">/sys/</tt> is mounted
- </li><li>Install the latest <tt class="filename">initscripts</tt> package
- </li><li>Install the latest <tt class="filename">udev</tt> package
- </li><li>Execute <tt class="command">/sbin/start_udev</tt>
- </li><li>Install the latest <tt class="filename">mkinitrd</tt> package
- </li><li>Install the latest <tt class="filename">kernel</tt> package
- </li><li>Or execute <tt class="command">mkinitrd</tt> for your existing kernel(s)
- </li></ul>
-
- <h2>Udev without <tt class="command">initrd</tt></h2>
-
- <p>Install Fedore Core as usual and reboot. Execute the following commands
+ <li>make sure /sys is mounted
+ <li>install the new initscripts
+ <li>install the new udev
+ <li>execute /sbin/start_udev
+ <li>install the new mkinitrd
+ <li>install a new kernel
+ <li>or mkinitrd for your existing kernel(s)
+ </ul>
</p>
-
-<pre class="screen">
-<tt class="command">
-mkdir /tmp/dev
-mount --move /dev /tmp/dev
-sbin/MAKEDEV null console zero
-mount --move /tmp/dev /dev
-</tt></pre>
- Install your kernel without an <tt class="command">initrd</tt>. Reboot.
- <p>
- You will get some SELinux errors, and syslogd will not work as expected.
+ <h2>Udev without initrd</h2>
+ <p>Install Fedore Core as usual and reboot.
+ <pre>
+ # mkdir /tmp/dev
+ # mount --move /dev /tmp/dev
+ # /sbin/MAKEDEV null console zero
+ # mount --move /tmp/dev /dev
+ </pre>
+ Install your kernel without an initrd. Reboot.
+ </p><p>
+ You will get some SELINUX errors and syslogd will not work as expected.
</p>
<h2>Current Problems on Fedora</h2>
<p>
- <a href="http://bugzilla.redhat.com/bugzilla/buglist.cgi?short_desc_type=allwordssubstr&component=udev&bug_status=ASSIGNED&bug_status=MODIFIED&bug_status=NEEDINFO&bug_status=NEW&bug_status=REOPENED&bug_status=VERIFIED&bug_severity=high&bug_severity=low&bug_severity=normal&bug_severity=security&bug_severity=translation&long_desc_type=allwordssubstr&bug_file_loc_type=allwordssubstr&status_whiteboard_type=allwordssubstr&fixed_in_type=allwordssubstr&devel_whiteboard_type=allwordssubstr&keywords_type=allwords&cust_facing=YES&emailassigned_to1=1&emailtype1=exact&emailreporter2=1&emailtype2=exact&bugidtype=include&chfieldto=Now&cmdtype=doit&remaction=run&namedcmd=blank&order=Reuse+same+sort+as+last+time&field0-0-0=noop&type0-0-0=noop">All open bugs for <code class="filename">udev</code></a>
+ <a href="http://bugzilla.redhat.com/bugzilla/buglist.cgi?short_desc_type=allwordssubstr&component=udev&bug_status=ASSIGNED&bug_status=MODIFIED&bug_status=NEEDINFO&bug_status=NEW&bug_status=REOPENED&bug_status=VERIFIED&bug_severity=high&bug_severity=low&bug_severity=normal&bug_severity=security&bug_severity=translation&long_desc_type=allwordssubstr&bug_file_loc_type=allwordssubstr&status_whiteboard_type=allwordssubstr&fixed_in_type=allwordssubstr&devel_whiteboard_type=allwordssubstr&keywords_type=allwords&cust_facing=YES&emailassigned_to1=1&emailtype1=exact&emailreporter2=1&emailtype2=exact&bugidtype=include&chfieldto=Now&cmdtype=doit&remaction=run&namedcmd=blank&order=Reuse+same+sort+as+last+time&field0-0-0=noop&type0-0-0=noop">All open bugs for <code class="filename">udev</code></a>
</p>
<h3>Nvidia</h3>
- <p>Quick solution: If you do not need rhgb, just load the nvidia module in <tt class="filename">/etc/rc.local</tt>
+ <p>Quick solution: If you do not need rhgb, just load the nvidia module in /etc/rc.local
</p><p>
- If you have udev >= 032-5, load the nvidia module:
+ If you have udev >= 032-5, load the nvidia module;
+ <pre>
+ # cp -a /dev/nvidia* /etc/udev/devices
+ # chown root.root /etc/udev/devices/nvidia*
+ </pre>
</p>
-<pre class="screen">
-<tt class="command">
-cp -a /dev/nvidia* /etc/udev/devices
-chown root.root /etc/udev/devices/nvidia*
-</tt></pre>
-
- <p>The Bugzilla for this problem is <strike><a href="https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=133900">133900</a></strike>.</p>
+ <p>The Bugzilla for this problem is <a href="https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=133900">133900</a>.</p>
<h3>Palm Pilot</h3>
<p>
- If you have udev >= 032-5, execute the command:
+ If you have udev >= 032-5:
+ <pre>
+ # ln -s ttyUSB1 /etc/udev/devices/pilot
+ </pre>
</p>
-<pre class="screen">
-<tt class="command">
-ln -s ttyUSB1 /etc/udev/devices/pilot
-</tt></pre>
-
<h3>ISDN</h3>
<p>
- If you have udev >= 032-5:
- </p>
-<pre class="screen">
-<tt class="command">
-/sbin/MAKEDEV -d /etc/udev/devices isdn
-</tt></pre>
+ If you have udev >= 032-5:
+ <pre>
+ # /sbin/MAKEDEV -d /etc/udev/devices isdn
</pre>
-
+ </p>
<!-- content END -->
-
</div>
<div class="fedora-corner-br"> </div>
<div class="fedora-corner-bl"> </div>
@@ -249,7 +207,7 @@
<br>The Fedora Project is not a supported product of Red Hat, Inc.
<br><a href="/legal/">Legal</a> | <a href="/about/trademarks/">Trademark Guidelines</a>
<br>
- This page last modified at: 2004/10/16 02:25:17
+ This page was last modified at: $Date$
<br>
</div>
<!-- footer END -->
Index: udev.permissions
===================================================================
RCS file: /cvs/dist/rpms/udev/FC-3/udev.permissions,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- udev.permissions 1 Aug 2005 16:55:10 -0000 1.7
+++ udev.permissions 7 Oct 2005 13:26:00 -0000 1.8
@@ -70,27 +70,27 @@
sndstat:root:root:0660
# optical devices
-sr*:root:disk:0640
-scd*:root:disk:0640
-pcd*:root:disk:0640
-disk*:root:disk:0640
-dvd:root:disk:0640
-rdvd:root:disk:0640
-cdroms/*:root:disk:0640
+sr*:root:disk:0660
+scd*:root:disk:0660
+pcd*:root:disk:0660
+disk*:root:disk:0660
+dvd:root:disk:0660
+rdvd:root:disk:0660
+cdroms/*:root:disk:0660
# pilot/palm devices
pilot:root:uucp:0660
# jaz devices
-jaz*:root:disk:0640
+jaz*:root:disk:0660
# zip devices
-pocketzip*:root:disk:0640
-zip*:root:disk:0640
+pocketzip*:root:disk:0660
+zip*:root:disk:0660
# ls120 devices
-ls120:root:disk:0640
-ls120*:root:disk:0640
+ls120:root:disk:0660
+ls120*:root:disk:0660
# lp devices
lp*:root:lp:0660
@@ -109,30 +109,28 @@
usb/mdc800*:root:root:0600
# raw devices
-ram*:root:disk:0640
-raw/*:root:disk:0640
+ram*:root:disk:0660
+raw/*:root:disk:0660
# disk devices
-hd*:root:disk:0640
-sd*:root:disk:0640
-dasd*:root:disk:0640
-ataraid*:root:disk:0640
-loop*:root:disk:0640
-md*:root:disk:0640
-ide/*/*/*/*/*:root:disk:0640
-discs/*/*:root:disk:0640
-loop/*:root:disk:0640
-md/*:root:disk:0640
+hd*:root:disk:0660
+sd*:root:disk:0660
+dasd*:root:disk:0660
+ataraid*:root:disk:0660
+loop*:root:disk:0660
+md*:root:disk:0660
+ide/*/*/*/*/*:root:disk:0660
+discs/*/*:root:disk:0660
+loop/*:root:disk:0660
+md/*:root:disk:0660
# tape devices
-ht*:root:disk:0640
-nht*:root:disk:0640
-pt[0-9]*:root:disk:0640
-npt*:root:disk:0640
-st*:root:disk:0640
-nst*:root:disk:0640
-osst*:root:disk:0640
-nosst*:root:disk:0640
+ht*:root:disk:0660
+nht*:root:disk:0660
+pt[0-9]*:root:disk:0660
+npt*:root:disk:0660
+st*:root:disk:0660
+nst*:root:disk:0660
# dm devices
dm-*:root:root:0640
@@ -144,10 +142,10 @@
flash*:root:root:0600
# diskonkey devices
-diskonkey*:root:disk:0640
+diskonkey*:root:disk:0660
# rem_ide devices
-microdrive*:root:disk:0640
+microdrive*:root:disk:0660
# fb devices
fb:root:root:0600
@@ -186,9 +184,9 @@
apm_bios:root:root:0600
# scsi devices
-sg*:root:disk:0640
-pg*:root:disk:0640
-cdwriter:root:disk:0640
+sg*:root:disk:0660
+pg*:root:disk:0660
+cdwriter:root:disk:0660
# usb devices
usb/dabusb*:root:usb:0660
@@ -197,8 +195,3 @@
# s390 devices
z90crypt:root:root:0666
-
-# DVB
-dvb/*:root:root:0660
-dvb:root:root:0660
-dvb/adapter*:root:root:0660
Index: udev.rules
===================================================================
RCS file: /cvs/dist/rpms/udev/FC-3/udev.rules,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- udev.rules 1 Aug 2005 16:55:10 -0000 1.24
+++ udev.rules 7 Oct 2005 13:26:00 -0000 1.25
@@ -1,236 +1,117 @@
# 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.
#
-# default is OWNER="root" GROUP="root", MODE="0600"
+# See the udev.rules.examples file for more examples of how to create rules
#
-# all block devices
-SUBSYSTEM=="block", GROUP="disk", MODE="0640"
-
-# console devices
-KERNEL=="tty", MODE="0666"
-KERNEL=="tty[0-9]", GROUP="tty", MODE="0660"
-KERNEL=="tty[0-9][0-9]*", GROUP="tty", MODE="0660"
-KERNEL=="vc/[0-9]*", GROUP="tty", MODE="0660"
-
-# pty devices
-# Set this to 0660 if you only want users belonging to tty group
-# to be able to allocate PTYs
-KERNEL=="ptmx", GROUP="tty", MODE="0666"
-KERNEL=="pty[p-za-e][0-9a-f]*", GROUP="tty", MODE="0660"
-KERNEL=="tty[p-za-e][0-9a-f]*", GROUP="tty", MODE="0660"
-KERNEL=="pty/m*", GROUP="tty", MODE="0660"
-KERNEL=="vc/s*", GROUP="tty", MODE="0660"
-
-# serial+dialup devices
-KERNEL=="ttyS*", GROUP="uucp", MODE="0660"
-KERNEL=="ippp*", MODE="0660"
-KERNEL=="isdn*", MODE="0660"
-KERNEL=="isdnctrl*", MODE="0660"
-SYSFS{dev}="68:0", NAME="capi20"
-SYSFS{dev}="191:[0-9]*", NAME="capi/%n"
-KERNEL=="capi*", MODE="0660"
-
-KERNEL=="dcbri*", MODE="0660"
-KERNEL=="ircomm*", GROUP="uucp", MODE="0660"
-KERNEL=="ttyUSB*", GROUP="uucp", MODE="0660"
-KERNEL=="tts/[0-9]*", GROUP="uucp", MODE="0660"
-KERNEL=="tts/USB[0-9]*", GROUP="uucp", MODE="0660"
-
-# vc devices
-KERNEL=="vcs", OWNER="vcsa", GROUP="tty"
-KERNEL=="vcs[0-9]*", OWNER="vcsa", GROUP="tty"
-KERNEL=="vcsa", OWNER="vcsa", GROUP="tty"
-KERNEL=="vcsa[0-9]*", OWNER="vcsa", GROUP="tty"
-KERNEL=="vcc/*", OWNER="vcsa", GROUP="tty"
-
-# memory devices
-KERNEL=="random", MODE="0666"
-KERNEL=="urandom", MODE="0444"
-KERNEL=="mem", GROUP="kmem", MODE="0640"
-KERNEL=="kmem", GROUP="kmem", MODE="0640"
-KERNEL=="port", GROUP="kmem", MODE="0640"
-KERNEL=="full", MODE="0666"
-KERNEL=="null", MODE="0666"
-KERNEL=="zero", MODE="0666"
-
-# misc devices
-KERNEL=="nvram", MODE="0660"
-KERNEL=="rtc", MODE="0644"
-
-# floppy devices
-KERNEL=="fd[01]*", GROUP="floppy", MODE="0660"
-
-# audio devices
-KERNEL=="dsp*", MODE="0660"
-KERNEL=="audio*", MODE="0660"
-KERNEL=="midi*", MODE="0660"
-KERNEL=="mixer*", MODE="0660"
-KERNEL=="sequencer*", MODE="0660"
-KERNEL=="sound/*", MODE="0660"
-KERNEL=="snd/*", MODE="0660"
-KERNEL=="beep", MODE="0660"
-KERNEL=="admm*", MODE="0660"
-KERNEL=="adsp*", MODE="0660"
-KERNEL=="aload*", MODE="0660"
-KERNEL=="amidi*", MODE="0660"
-KERNEL=="dmfm*", MODE="0660"
-KERNEL=="dmmidi*", MODE="0660"
-KERNEL=="sndstat", MODE="0660"
-
-# pilot/palm devices
-KERNEL=="pilot", GROUP="uucp", MODE="0660"
-
-# lp devices
-KERNEL=="lp*", GROUP="lp", MODE="0660"
-KERNEL=="parport*", GROUP="lp", MODE="0660"
-KERNEL=="irlpt*", GROUP="lp", MODE="0660"
-KERNEL=="usblp*", GROUP="lp", MODE="0660"
-KERNEL=="usb/lp*", GROUP="lp", MODE="0660"
-
-# tape devices
-KERNEL=="ht*", GROUP="disk", MODE="0640"
-KERNEL=="nht*", GROUP="disk", MODE="0640"
-KERNEL=="pt[0-9]*", GROUP="disk", MODE="0640"
-KERNEL=="npt*", GROUP="disk", MODE="0640"
-KERNEL=="st*", GROUP="disk", MODE="0640"
-KERNEL=="nst*", GROUP="disk", MODE="0640"
-KERNEL=="osst*", GROUP="disk", MODE="0640"
-KERNEL=="nosst*", GROUP="disk", MODE="0640"
-
-# diskonkey devices
-KERNEL=="diskonkey*", GROUP="disk", MODE="0640"
-
-# rem_ide devices
-KERNEL=="microdrive*", GROUP="disk", MODE="0640"
-
-# kbd devices
-KERNEL=="kbd", MODE="0644"
-
-# joystick devices
-KERNEL=="js[0-9]*", MODE="0644"
-KERNEL=="djs[0-9]*", MODE="0644"
-
-# v4l devices
-KERNEL=="video*", MODE="0660"
-KERNEL=="radio*", MODE="0660"
-KERNEL=="winradio*", MODE="0660"
-KERNEL=="vtx*", MODE="0660"
-KERNEL=="vbi*", MODE="0660"
-KERNEL=="video/*", MODE="0660"
-KERNEL=="vttuner", MODE="0660"
-KERNEL=="v4l/*", MODE="0660"
-
-# input devices
-KERNEL=="input/*", MODE="0660"
-
-# gpm devices
-KERNEL=="gpmctl", MODE="0700"
-
-# dri devices
-KERNEL=="nvidia*", MODE="0660"
-KERNEL=="3dfx*", MODE="0660"
-KERNEL=="dri/*", MODE="0666"
-
-# usb devices
-KERNEL=="usb/dabusb*", GROUP="usb", MODE="0660"
-KERNEL=="usb/mdc800*", GROUP="usb", MODE="0660"
-KERNEL=="usb/rio500", GROUP="usb", MODE="0660"
-
-# s390 devices
-KERNEL=="z90crypt", MODE="0666"
-
-# DVB
-KERNEL=="dvb/*", MODE="0660"
-KERNEL=="dvb", MODE="0660"
-KERNEL=="dvb/adapter*", MODE="0660"
-
# create a symlink named after the device map name
# note devmap_name comes with extras/multipath
-#KERNEL=="dm-[0-9]*", PROGRAM="/sbin/devmap_name %M %m", NAME="%k", SYMLINK="%c"
+#KERNEL="dm-[0-9]*", PROGRAM="/sbin/devmap_name %M %m", NAME="%k", SYMLINK="%c"
# DRI devices always go into a subdirectory (as per the LSB spec)
-KERNEL=="card*", NAME="dri/card%n"
+KERNEL="card*", NAME="dri/card%n"
# alsa devices
-KERNEL=="controlC[0-9]*", NAME="snd/%k"
-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"
+KERNEL="controlC[0-9]*", NAME="snd/%k"
+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"
# input devices
-KERNEL=="mice", NAME="input/%k"
-KERNEL=="mouse*", NAME="input/%k"
-KERNEL=="event*", NAME="input/%k"
-KERNEL=="js*", NAME="input/%k"
-KERNEL=="ts*", NAME="input/%k"
-
-KERNEL=="raw[0-9]*", NAME="raw/%k"
-
-KERNEL=="lp[0-9]*", SYMLINK="par%n"
-BUS=="usb", KERNEL=="lp[0-9]*", NAME="usb/%k"
-
-KERNEL=="microcode", NAME="cpu/%k"
-# provide symlinks for backwards compatibility
-KERNEL="msr[0-9]*", NAME="cpu/%n/msr", SYMLINK="cpu/%k"
-KERNEL="cpu[0-9]*", NAME="cpu/%n/cpu", SYMLINK="cpu/%k", SYMLINK="%k"
-
-KERNEL=="ram1", SYMLINK="ram"
-KERNEL=="video0", SYMLINK="video"
-KERNEL=="radio0", SYMLINK="radio"
-KERNEL=="audio0", SYMLINK="audio"
-KERNEL=="dsp0", SYMLINK="dsp"
-KERNEL=="fb0", SYMLINK="fb"
-KERNEL=="qft0", SYMLINK="ftape"
-KERNEL=="isdnctrl0", SYMLINK="isdnctrl"
-KERNEL=="mixer0", SYMLINK="mixer"
-KERNEL=="ram0", SYMLINK="ramdisk"
-KERNEL=="sbpcd0", SYMLINK="sbpcd"
-KERNEL=="radio0", SYMLINK="radio"
-KERNEL=="tty0", SYMLINK="systty"
-KERNEL=="vbi0", SYMLINK="vbi"
-KERNEL=="null", SYMLINK="XOR"
+KERNEL="mice", NAME="input/%k"
+KERNEL="mouse*", NAME="input/%k"
+KERNEL="event*", NAME="input/%k"
+KERNEL="js*", NAME="input/%k"
+KERNEL="ts*", NAME="input/%k"
+
+KERNEL="raw[0-9]*", NAME="raw/%k"
+
+KERNEL="lp[0-9]*", SYMLINK="par%n"
+BUS="usb", KERNEL="lp[0-9]*", NAME="usb/%k"
+
+KERNEL="microcode", SYMLINK="cpu/0/%k"
+KERNEL="ram1", SYMLINK="ram"
+KERNEL="video0", SYMLINK="video"
+KERNEL="radio0", SYMLINK="radio"
+KERNEL="audio0", SYMLINK="audio"
+KERNEL="dsp0", SYMLINK="dsp"
+KERNEL="fb0", SYMLINK="fb"
+KERNEL="qft0", SYMLINK="ftape"
+KERNEL="isdnctrl0", SYMLINK="isdnctrl"
+KERNEL="mixer0", SYMLINK="mixer"
+KERNEL="ram0", SYMLINK="ramdisk"
+KERNEL="sbpcd0", SYMLINK="sbpcd"
+KERNEL="radio0", SYMLINK="radio"
+KERNEL="tty0", SYMLINK="systty"
+KERNEL="vbi0", SYMLINK="vbi"
+KERNEL="null", SYMLINK="XOR"
-KERNEL=="tun", NAME="net/%k"
+KERNEL="tun", NAME="net/%k"
-KERNEL=="device-mapper", NAME="mapper/control"
+KERNEL="device-mapper", NAME="mapper/control"
# old compat symlinks with enumeration
-KERNEL=="sr[0-9]*", SYMLINK="cdrom%e"
-KERNEL=="scd[0-9]*", SYMLINK="cdrom%e"
-KERNEL=="pcd[0-9]*", SYMLINK="cdrom%e"
-KERNEL=="fd[0-9]*", SYMLINK="floppy%e"
-KERNEL=="nst[0-9]", BUS=="scsi", SYMLINK="tape%e"
-KERNEL=="nosst[0-9]", BUS=="scsi", SYMLINK="tape%e"
-
-KERNEL=="umad*", NAME="infiniband/%k"
-KERNEL=="issm*", NAME="infiniband/%k"
-
-# Section for zaptel device
-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"
+KERNEL="sr[0-9]*", SYMLINK="cdrom%e"
+KERNEL="scd[0-9]*", SYMLINK="cdrom%e"
+KERNEL="pcd[0-9]*", SYMLINK="cdrom%e"
+KERNEL="fd[0-9]*", SYMLINK="floppy%e"
+KERNEL="nst[0-9]", SYMLINK="tape%e"
+
+KERNEL="dvb" Name="dvb0"
+
+KERNEL="dvb0.dvr*", NAME="dvb/adapter0/dvr%n"
+KERNEL="dvb0.demux*", NAME="dvb/adapter0/demux%n"
+KERNEL="dvb0.frontend*", NAME="dvb/adapter0/frontend%n"
+KERNEL="dvb0.audio*", NAME="dvb/adapter0/audio%n"
+KERNEL="dvb0.ca*", NAME="dvb/adapter0/ca%n"
+KERNEL="dvb0.osd*", NAME="dvb/adapter0/osd%n"
+KERNEL="dvb0.net*", NAME="dvb/adapter0/net%n"
+KERNEL="dvb0.video*", NAME="dvb/adapter0/video%n"
+
+KERNEL="dvb1.dvr*", NAME="dvb/adapter1/dvr%n"
+KERNEL="dvb1.demux*", NAME="dvb/adapter1/demux%n"
+KERNEL="dvb1.frontend*", NAME="dvb/adapter1/frontend%n"
+KERNEL="dvb1.audio*", NAME="dvb/adapter1/audio%n"
+KERNEL="dvb1.ca*", NAME="dvb/adapter1/ca%n"
+KERNEL="dvb1.osd*", NAME="dvb/adapter1/osd%n"
+KERNEL="dvb1.net*", NAME="dvb/adapter1/net%n"
+KERNEL="dvb1.video*", NAME="dvb/adapter1/video%n"
+
+KERNEL="dvb2.dvr*", NAME="dvb/adapter2/dvr%n"
+KERNEL="dvb2.demux*", NAME="dvb/adapter2/demux%n"
+KERNEL="dvb2.frontend*", NAME="dvb/adapter2/frontend%n"
+KERNEL="dvb2.audio*", NAME="dvb/adapter2/audio%n"
+KERNEL="dvb2.ca*", NAME="dvb/adapter2/ca%n"
+KERNEL="dvb2.osd*", NAME="dvb/adapter2/osd%n"
+KERNEL="dvb2.net*", NAME="dvb/adapter2/net%n"
+KERNEL="dvb2.video*", NAME="dvb/adapter2/video%n"
+
+KERNEL="dvb3.dvr*", NAME="dvb/adapter3/dvr%n"
+KERNEL="dvb3.demux*", NAME="dvb/adapter3/demux%n"
+KERNEL="dvb3.frontend*", NAME="dvb/adapter3/frontend%n"
+KERNEL="dvb3.audio*", NAME="dvb/adapter3/audio%n"
+KERNEL="dvb3.ca*", NAME="dvb/adapter3/ca%n"
+KERNEL="dvb3.osd*", NAME="dvb/adapter3/osd%n"
+KERNEL="dvb3.net*", NAME="dvb/adapter3/net%n"
+KERNEL="dvb3.video*", NAME="dvb/adapter3/video%n"
# do not seperate the next 2 lines!!
-KERNEL=="hd[a-z]", BUS=="ide", SYSFS{removable}=="1", PROGRAM=="/etc/udev/scripts/ide-media.sh %k", RESULT=="floppy", SYMLINK="floppy%e", NAME{ignore_remove, all_partitions}="%k"
+KERNEL="hd[a-z]", BUS="ide", SYSFS{removable}="1", PROGRAM="/etc/udev/scripts/ide-media.sh %k", RESULT="floppy", SYMLINK="floppy%e", NAME{all_partitions}="%k", NOREMOVE="1"
+KERNEL="hd[a-z]", BUS="ide", SYSFS{removable}="1", RESULT="cdrom", SYMLINK="cdrom%e"
-KERNEL=="hd[a-z]", BUS=="ide", SYSFS{removable}=="1", RESULT=="cdrom", SYMLINK="cdrom%e"
+KERNEL="hd[a-z]", BUS="ide", SYSFS{removable}="1", PROGRAM="/etc/udev/scripts/check-cdrom.sh %k DVD", SYMLINK="dvd%e"
+KERNEL="sr[0-9]*", BUS="scsi", PROGRAM="/etc/udev/scripts/check-cdrom.sh %k DVD", SYMLINK="dvd%e"
-KERNEL=="hd[a-z]", BUS=="ide", SYSFS{removable}=="1", PROGRAM=="/etc/udev/scripts/check-cdrom.sh %k DVD", SYMLINK="dvd%e"
-KERNEL=="sr[0-9]*", BUS=="scsi", PROGRAM=="/etc/udev/scripts/check-cdrom.sh %k DVD", SYMLINK="dvd%e"
+KERNEL="hd[a-z]", BUS="ide", SYSFS{removable}="1", PROGRAM="/etc/udev/scripts/check-cdrom.sh %k CD-R", SYMLINK="cdwriter%e"
+KERNEL="sr[0-9]*", BUS="scsi", PROGRAM="/etc/udev/scripts/check-cdrom.sh %k CD-R", SYMLINK="cdwriter%e"
-KERNEL=="hd[a-z]", BUS=="ide", SYSFS{removable}=="1", PROGRAM=="/etc/udev/scripts/check-cdrom.sh %k CD-R", SYMLINK="cdwriter%e"
-KERNEL=="sr[0-9]*", BUS=="scsi", PROGRAM=="/etc/udev/scripts/check-cdrom.sh %k CD-R", SYMLINK="cdwriter%e"
-
-KERNEL=="hd[a-z]", BUS=="ide", SYSFS{removable}=="1", PROGRAM="/etc/udev/scripts/check-cdrom.sh %k DVD-R", SYMLINK="dvdwriter%e"
-KERNEL=="sr[0-9]*", BUS=="scsi", PROGRAM=="/etc/udev/scripts/check-cdrom.sh %k DVD-R", SYMLINK="dvdwriter%e"
+KERNEL="hd[a-z]", BUS="ide", SYSFS{removable}="1", PROGRAM="/etc/udev/scripts/check-cdrom.sh %k DVD-R", SYMLINK="dvdwriter%e"
+KERNEL="sr[0-9]*", BUS="scsi", PROGRAM="/etc/udev/scripts/check-cdrom.sh %k DVD-R", SYMLINK="dvdwriter%e"
# rename sr* to scd*
-KERNEL=="sr[0-9]*", BUS=="scsi", NAME="scd%n"
-KERNEL=="hd[a-z]*", BUS=="ide", SYSFS{removable}=="1", NAME{ignore_remove}="%k"
+KERNEL="sr[0-9]*", BUS="scsi", NAME="scd%n"
+KERNEL="hd[a-z]*", BUS="ide", SYSFS{removable}="1", NOREMOVE="1"
+
-KERNEL=="dvb*", PROGRAM=="/etc/udev/scripts/dvb.sh %k", NAME="%c"
Index: udev.rules.persistent
===================================================================
RCS file: /cvs/dist/rpms/udev/FC-3/udev.rules.persistent,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- udev.rules.persistent 1 Aug 2005 16:55:10 -0000 1.5
+++ udev.rules.persistent 7 Oct 2005 13:26:00 -0000 1.6
@@ -1,18 +1,18 @@
-BUS=="scsi", PROGRAM="/sbin/udev.get_persistent_device_name.sh", SYMLINK="%c{1+}"
-BUS=="usb", PROGRAM="/sbin/udev.get_persistent_device_name.sh", SYMLINK="%c{1+}"
-BUS=="ide", PROGRAM="/sbin/udev.get_persistent_device_name.sh", SYMLINK="%c{1+}"
+BUS="scsi", PROGRAM="/sbin/udev.get_persistent_device_name.sh", NAME="%k" SYMLINK="%c{1+}"
+BUS="usb", PROGRAM="/sbin/udev.get_persistent_device_name.sh", NAME="%k" SYMLINK="%c{1+}"
+BUS="ide", PROGRAM="/sbin/udev.get_persistent_device_name.sh", NAME="%k" SYMLINK="%c{1+}"
# S/390 zfcp, full disk
-BUS=="ccw", PROGRAM="/sbin/scsi_id" SYSFS{cutype}="1731/03" SYSFS{devtype}="1732/03" KERNEL="sd*[!0-9]", SYMLINK="disk/by-path/ccw-%s{hba_id}-fcp-%s{wwpn}:%s{fcp_lun} disk/by-serial/fcp-%c{1}%c{2}-%c{3}"
+BUS="ccw", PROGRAM="/sbin/scsi_id" SYSFS{cutype}="1731/03" SYSFS{devtype}="1732/03" KERNEL="sd*[!0-9]", NAME="%k" SYMLINK="disk/by-path/ccw-%s{hba_id}-fcp-%s{wwpn}:%s{fcp_lun} disk/by-serial/fcp-%c{1}%c{2}-%c{3}"
# S/390 zfcp, disk partition
-BUS=="ccw", PROGRAM="/sbin/scsi_id" SYSFS{cutype}="1731/03" SYSFS{devtype}="1732/03" KERNEL="sd*[0-9]", SYMLINK="disk/by-path/ccw-%s{hba_id}-fcp-%s{wwpn}:%s{fcp_lun}-part%n disk/by-serial/fcp-%c{1}%c{2}-%c{3}-part%n"
+BUS="ccw", PROGRAM="/sbin/scsi_id" SYSFS{cutype}="1731/03" SYSFS{devtype}="1732/03" KERNEL="sd*[0-9]", NAME="%k" SYMLINK="disk/by-path/ccw-%s{hba_id}-fcp-%s{wwpn}:%s{fcp_lun}-part%n disk/by-serial/fcp-%c{1}%c{2}-%c{3}-part%n"
# S/390 DASD, full disk
-BUS=="ccw", SYSFS_discipline="ECKD" KERNEL="dasd*[!0-9]", SYMLINK="disk/by-path/ccw-%b"
+BUS="ccw", SYSFS_discipline="ECKD" KERNEL="dasd*[!0-9]", NAME="%k" SYMLINK="disk/by-path/ccw-%b"
# S/390 DASD, disk partition
-BUS=="ccw", SYSFS_discipline="ECKD" KERNEL="dasd*[0-9]", SYMLINK="disk/by-path/ccw-%b-part%n"
+BUS="ccw", SYSFS_discipline="ECKD" KERNEL="dasd*[0-9]", NAME="%k" SYMLINK="disk/by-path/ccw-%b-part%n"
# KERNEL="ntibm*[0-9]", SYMLINK="tape/%b/non-rewinding"
# KERNEL="rtibm*[0-9]", SYMLINK="tape/%b/rewinding"
Index: udev.spec
===================================================================
RCS file: /cvs/dist/rpms/udev/FC-3/udev.spec,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -r1.75 -r1.76
--- udev.spec 1 Aug 2005 16:55:10 -0000 1.75
+++ udev.spec 7 Oct 2005 13:26:00 -0000 1.76
@@ -1,3 +1,25 @@
+# if we want to build the static version with klibc or not
+# 0 - build with glibc
+# 1 - build with klibc
+%define klibc 0
+
+# if we want to build the volume_id "extra" package or not
+# 0 - do not build the package
+# 1 - build it
+%define volume_id 1
+
+# if we want to build the scsi_id "extra" package or not
+# 0 - do not build the package
+# 1 - build it
+%define scsi_id 1
+
+%define chassis_id 0
+
+# if we want to build pam_console support
+# 0 - do not build the package
+# 1 - build it
+%define pam_console 1
+
%define udev_kernel_includes 2.6.6
%define debug false
@@ -6,16 +28,17 @@
Summary: A userspace implementation of devfs
Name: udev
-Version: 058
-Release: 0.FC3.1
+Version: 039
+Release: 10.FC3.8
License: GPL
Group: System Environment/Base
%if !%{with_persistent}
Provides: udev-persistent = 0:%{version}-%{release}
Obsoletes: udev-persistent < 0:030-5
%endif
-Source: ftp://ftp.kernel.org/pub/linux/utils/kernel/hotplug/%{name}-%{version}.tar.bz2
+Source: ftp://ftp.kernel.org/pub/linux/utils/kernel/hotplug/%{name}-%{version}.tar.gz
Source1: udev.rules
+Source2: udev.permissions
Source3: udev.conf
Source4: pam_console.dev
Source5: MAKEDEV.dev
@@ -29,33 +52,73 @@
Source14: udev.get_unique_hardware_path.sh
Source15: udev.get_unique_drive_id.sh
Source16: udev.rules.persistent
-
Source17: check-cdrom.sh
Source18: ide-media.sh
-Source19: dvb.sh
Source20: start_udev
Source21: udev.html
-Source22: udev.nodes
-Source23: udevpermconv.sh
+%if %{klibc}
+Source30: include-linux-%{udev_kernel_includes}.tar.bz2
+%endif
Patch1: udev-039-static.patch
-Patch50: udev-039-scsi_id-tmp_dir.patch
+Patch2: udev-025-volsbin.patch
+Patch3: udev-039-wait-error-log.patch
+Patch4: udev-039-logging.patch
+Patch5: udev-039-wait-ppp-class.patch
+Patch6: udev-039-wait-dm-block.patch
+Patch7: udev-039-static2.patch
+Patch8: udev-039-netif.patch
+Patch9: udev-039-dummy.patch
+Patch10: udev-039-volume_id-nonblock.patch
+Patch11: udev-039-norm.patch
+
+Patch22: udev-032-symlink.patch
+Patch24: udev-038-volmak.patch
+
+Patch25: udev-039-wait.patch
+Patch26: udev-039-sig.patch
+Patch27: udev-039-media.patch
+
+Patch28: udev-039-noinfo.patch
+
+%if %{klibc}
+Patch30: include-linux-2.6.6-fdset.patch
+Patch31: include-linux-2.6.6-ia64-page.patch
+Patch32: include-linux-2.6.6-ia64-break.patch
+Patch33: include-linux-2.6.6-s390-bitops.patch
+
+Patch40: udev-025-klibc-strnlen.patch
+Patch41: udev-029-lseek64.patch
+Patch42: klibc-0.115-ia64.patch
+Patch43: klibc-0.148.ia64.patch
+Patch44: klibc-0.148-getpagesize.patch
+%endif
+
+Patch45: udev-039-detach_state.patch
+
ExclusiveOS: Linux
URL: http://kernel.org/pub/linux/utils/kernel/hotplug/
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
Prereq: /bin/sh fileutils hotplug
-Prereq: MAKEDEV >= 0:3.11
-BuildRequires: sed libselinux-devel >= 0:1.17.9-2 flex
-Requires: libselinux >= 0:1.17.9-2 MAKEDEV
-Conflicts: kernel < 0:2.6 mkinitrd <= 0:4.1.11-1 initscripts < 7.84
-Obsoletes: dev
-Provides: dev = 0:3.12-1
+Prereq: MAKEDEV >= 0:3.11, lvm2
+BuildRequires: sed
+BuildRequires: libselinux-devel >= 0:1.17.9-2
+BuildRequires: flex
+Requires: libselinux >= 0:1.17.9-2
+Requires: MAKEDEV
+Conflicts: kernel < 0:2.6
+Conflicts: mkinitrd <= 0:4.1.11-1
+Conflicts: initscripts < 7.84
+Obsoletes: dev
+Provides: dev = 0:3.12-1
+%if %{pam_console}
BuildRequires: pam-devel glib2-devel bison
Requires: pam
+%endif
%description
udev is a implementation of devfs in userspace using sysfs and
@@ -75,42 +138,89 @@
%define add %{nil}
%prep
-%setup -q -a 10
+%if %{pam_console}
+%define pamadd -a 10
+%endif
+%if %{klibc}
+%define klibcadd -a 30
+%endif
+%setup -q %{pamadd} %{klibcadd}
-#%patch1 -p1 -b .glibcstatic
-%patch50 -p1 -b .tmp_dir
+%patch1 -p1 -b .glibcstatic
+%patch2 -p1 -b .volsbin
+%patch3 -p1 -b .waiterrorlog
+%patch4 -p1 -b .closelog
+%patch5 -p1 -b .waitppp
+%patch6 -p1 -b .waitdm
+%patch7 -p1 -b .udevstatic
+%patch8 -p1 -b .netif
+%patch9 -p1 -b .dummy
+%patch10 -p1 -b .nonblock
+%patch11 -p1 -b .norm
+%patch22 -p1 -b .symlink
touch etc/init.d/udev.debian
+%patch24 -p1 -b .volmak
+%patch25 -p1 -b .wait
+%patch26 -p1 -b .sig
+%patch27 -p1 -b .media
+%patch28 -p1 -b .noinfo
%if %{with_persistent}
- mkdir ata_identify
- cp %{SOURCE11} ata_identify
- cp %{SOURCE12} ata_identify/Makefile
+mkdir ata_identify
+cp %{SOURCE11} ata_identify
+cp %{SOURCE12} ata_identify/Makefile
%endif
cp %{SOURCE21} .
+%if %{klibc}
+mkdir -p klibc/klibc/linux
+mv include-linux-%{udev_kernel_includes} klibc/klibc/linux/include
+pushd klibc/klibc/linux/include
+for i in `find -type f`;do grep -Eq 'linux/(autoconf|config).h' $i || continue ; sed '/linux\/autoconf.h/d;/linux\/config.h/d' < $i > $i. ; mv $i. $i ; done
+ln -sv asm-`uname -m |
+sed -e s/i.86/i386/ \
+-e s/sun4u/sparc64/ \
+-e s/arm.*/arm/ \
+-e s/sa110/arm/ \
+-e s/s390x/s390/ \
+-e s/parisc64/parisc/` asm
+popd
+
+%patch30 -p1 -b .fdset
+%patch31 -p1 -b .page
+%patch32 -p1 -b .break
+%patch33 -p1 -b .bitops
+
+pushd klibc
+%patch40 -p2 -b .strnlen
+%patch41 -p2 -b .lseek64
+%patch42 -p1 -b .p40
+%patch43 -p1 -b .p41
+#%patch44 -p1 -b .p42
+popd
+%endif
+
+%patch45 -p1 -b .detach_state
+
%build
# Do not USE_LOG in udev.static, cause it causes segfaults on openlog (bug 136005)
+%if %{klibc}
+make CC="gcc $RPM_OPT_FLAGS -D__user=''" KERNEL_DIR="$PWD/klibc/klibc/linux" \
+ USE_KLIBC=true \
+ USE_SELINUX=false \
+%else
make CC="gcc $RPM_OPT_FLAGS -DUDEV_STATIC" LD="gcc $RPM_OPT_FLAGS -static" \
USE_KLIBC=false \
USE_SELINUX=true \
- USE_STATIC=true \
+%endif
udevdir="/dev" \
USE_LOG=false DEBUG=%{debug} \
- EXTRAS="extras/scsi_id \
-%if %{with_persistent}
- ata_identify \
-%endif
- " all
+ EXTRAS="" udev
mv udev udev.static
-mv udevstart udevstart.static
-mv extras/scsi_id/scsi_id extras/scsi_id/scsi_id.static
-%if %{with_persistent}
- mv ata_identify/ata_identify ata_identify/ata_identify.static
-%endif
make clean
make CC="gcc $RPM_OPT_FLAGS" \
@@ -120,17 +230,28 @@
USE_LOG=true \
DEBUG=%{debug} \
EXTRAS=" \
+%if %{scsi_id}
extras/scsi_id \
+%endif
+%if %{volume_id}
+ extras/volume_id \
+%endif
+%if %{chassis_id}
extras/chassis_id \
-%if %{with_persistent}
- ata_identify \
%endif
+%if %{with_persistent}
+ ata_identify"
+%else
"
- #extras/volume_id
+%endif
+
+
+%if %{pam_console}
pushd pam_console_setowner
make LIBDIR=%{_libdir}
popd
+%endif
%install
@@ -140,22 +261,31 @@
make DESTDIR=$RPM_BUILD_ROOT install \
EXTRAS=" \
+%if %{scsi_id}
extras/scsi_id \
+%endif
+%if %{volume_id}
+ extras/volume_id \
+%endif
+%if %{chassis_id}
extras/chassis_id \
-%if %{with_persistent}
- ata_identify \
%endif
+%if %{with_persistent}
+ ata_identify"
+%else
"
+%endif
rm -f $RPM_BUILD_ROOT%{_sysconfdir}/udev/udev.rules
+rm -f $RPM_BUILD_ROOT%{_sysconfdir}/udev/udev.permissions
rm -f $RPM_BUILD_ROOT%{_sysconfdir}/init.d/udev
-rm -f $RPM_BUILD_ROOT%{_sysconfdir}/hotplug.d/default/10-udev.hotplug
-mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/udev/{rules.d,scripts,devices,makedev.d}
+mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/udev/{rules.d,permissions.d,scripts,devices}
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/dev.d/{default,block}
install -m 0644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/udev/rules.d/50-udev.rules
+install -m 0644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/udev/permissions.d/50-udev.permissions
install -m 0644 %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/udev/udev.conf
@@ -164,33 +294,25 @@
# obsoleted by selinux patch
#install -m 0755 %{SOURCE5} $RPM_BUILD_ROOT%{_sysconfdir}/dev.d/default
install -m 0755 udev.static $RPM_BUILD_ROOT/sbin/udev.static
-install -m 0755 udevstart.static $RPM_BUILD_ROOT/sbin/udevstart.static
-install -m 0755 extras/scsi_id/scsi_id.static $RPM_BUILD_ROOT/sbin/scsi_id.static
-%if %{with_persistent}
- install -m 0755 ata_identify/ata_identify.static $RPM_BUILD_ROOT/sbin/ata_identify.static
-%endif
-
+ln -s udev.static $RPM_BUILD_ROOT/sbin/udevstart.static
%if %{with_persistent}
#persistent
install -m 0755 %{SOURCE13} $RPM_BUILD_ROOT/sbin
install -m 0755 %{SOURCE14} $RPM_BUILD_ROOT/sbin
install -m 0755 %{SOURCE15} $RPM_BUILD_ROOT/sbin
-install -m 0644 %{SOURCE16} $RPM_BUILD_ROOT%{_sysconfdir}/udev/rules.d/49-udev-persistent.rules
-#install -m 0644 extras/volume_id/s390-dasd.rules $RPM_BUILD_ROOT%{_sysconfdir}/udev/rules.d/52-udev-s390-persistent.rules
+install -m 0644 %{SOURCE16} $RPM_BUILD_ROOT%{_sysconfdir}/udev/rules.d/51-udev-persistent.rules
+install -m 0644 extras/volume_id/s390-dasd.rules $RPM_BUILD_ROOT%{_sysconfdir}/udev/rules.d/52-udev-s390-persistent.rules
%endif
+%if %{pam_console}
install -m 0755 %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir}/udev/scripts/
ln -s ../../udev/scripts/pam_console.dev $RPM_BUILD_ROOT%{_sysconfdir}/dev.d/default/05-pam_console.dev
install -m 0755 pam_console_setowner/pam_console_setowner $RPM_BUILD_ROOT/sbin
-
+%endif
install -m 0755 %{SOURCE17} $RPM_BUILD_ROOT%{_sysconfdir}/udev/scripts/
install -m 0755 %{SOURCE18} $RPM_BUILD_ROOT%{_sysconfdir}/udev/scripts/
-install -m 0755 %{SOURCE19} $RPM_BUILD_ROOT%{_sysconfdir}/udev/scripts/
-install -m 0755 %{SOURCE23} $RPM_BUILD_ROOT%{_sysconfdir}/udev/scripts/
-
-install -m 0755 %{SOURCE22} $RPM_BUILD_ROOT%{_sysconfdir}/udev/makedev.d/50-udev.nodes
mkdir -p $RPM_BUILD_ROOT%{_datadir}/udev
install -m 0644 %{SOURCE20} $RPM_BUILD_ROOT/sbin/start_udev
@@ -237,7 +359,9 @@
%files
%defattr(-,root,root)
%doc COPYING README TODO ChangeLog HOWTO* docs/* udev.html
-%doc etc/udev/redhat/udev.rules
+%doc etc/udev/udev.rules.{examples,redhat}
+%doc etc/udev/udev.permissions.redhat
+
%attr(0755,root,root) /sbin/udev
%attr(0755,root,root) /sbin/udev.static
%attr(0755,root,root) /sbin/udevsend
@@ -245,27 +369,28 @@
%attr(0755,root,root) /sbin/udevstart
%attr(0755,root,root) /sbin/udevstart.static
%attr(0755,root,root) /sbin/start_udev
-#%attr(755,root,root) /sbin/udev_volume_id
-%attr(755,root,root) /sbin/chassis_id
-%attr(755,root,root) /sbin/scsi_id
-%attr(755,root,root) /sbin/scsi_id.static
-%attr(0755,root,root) /sbin/pam_console_setowner
-
+%attr(0755,root,root) /sbin/wait_for_sysfs
+%if %{with_persistent}
+%attr(755,root,root) /sbin/ata_identify
+%endif
%attr(0755,root,root) %{_bindir}/udevtest
%attr(0755,root,root) %{_bindir}/udevinfo
%attr(0755,root,root) %dir %{_sysconfdir}/udev/
%attr(0755,root,root) %dir %{_sysconfdir}/udev/rules.d/
+%attr(0755,root,root) %dir %{_sysconfdir}/udev/permissions.d/
%attr(0755,root,root) %dir %{_sysconfdir}/udev/scripts/
%attr(0755,root,root) %dir %{_sysconfdir}/udev/devices/
-%attr(0755,root,root) %dir %{_sysconfdir}/udev/makedev.d/
+
+
+%if %{pam_console}
+%attr(0755,root,root) /sbin/pam_console_setowner
%attr(0755,root,root) %{_sysconfdir}/udev/scripts/pam_console.dev
%config(missingok) %{_sysconfdir}/dev.d/default/05-pam_console.dev
-%config(missingok) %{_sysconfdir}/dev.d/net/hotplug.dev
+%endif
-%attr(0755,root,root) %dir %{_sysconfdir}/dev.d/default
-%attr(0755,root,root) %dir %{_sysconfdir}/dev.d/net
+%config(missingok) %{_sysconfdir}/dev.d/net/hotplug.dev
# floppy madness
%attr(0755,root,root) %dir %{_sysconfdir}/dev.d/
@@ -279,111 +404,88 @@
%attr(0755,root,root) %{_sysconfdir}/udev/scripts/hotplug.dev
%attr(0755,root,root) %{_sysconfdir}/udev/scripts/check-cdrom.sh
%attr(0755,root,root) %{_sysconfdir}/udev/scripts/ide-media.sh
-%attr(0755,root,root) %{_sysconfdir}/udev/scripts/dvb.sh
-%attr(0755,root,root) %{_sysconfdir}/udev/scripts/udevpermconv.sh
%config %attr(0644,root,root) %{_sysconfdir}/udev/udev.conf
%config %attr(0644,root,root) %{_sysconfdir}/udev/rules.d/50-udev.rules
-%config %attr(0644,root,root) %dir %{_sysconfdir}/udev/makedev.d/50-udev.nodes
+%config %attr(0644,root,root) %{_sysconfdir}/udev/permissions.d/50-udev.permissions
-#%config(missingok) %{_sysconfdir}/hotplug.d/default/10-udev.hotplug
-%config(noreplace) %attr(0644,root,root) %{_sysconfdir}/scsi_id.config
+
+%config(missingok) %{_sysconfdir}/hotplug.d/default/05-wait_for_sysfs.hotplug
+%config(missingok) %{_sysconfdir}/hotplug.d/default/10-udev.hotplug
%attr(0644,root,root) %{_mandir}/man8/udev*.8*
-%attr(0644,root,root) %{_mandir}/man8/scsi_id*.8*
+
+
+%if %{scsi_id}
+ %attr(755,root,root) /sbin/scsi_id
+ %config(noreplace) %attr(0644,root,root) %{_sysconfdir}/scsi_id.config
+ %attr(0644,root,root) %{_mandir}/man8/scsi_id*.8*
+%endif
+%if %{volume_id}
+ %attr(755,root,root) /sbin/udev_volume_id
+%endif
+%if %{chassis_id}
+ %attr(755,root,root) /sbin/chassis_id
+%endif
%if %{with_persistent}
%files -n udev-persistent
- %if %{with_persistent}
- %attr(0755,root,root) /sbin/ata_identify
- %attr(0755,root,root) /sbin/ata_identify.static
- %endif
-
- %config %attr(0644,root,root) %{_sysconfdir}/udev/rules.d/49-udev-persistent.rules
- %attr(0755,root,root) /sbin/udev.get_persistent_device_name.sh
- %attr(0755,root,root) /sbin/udev.get_unique_hardware_path.sh
- %attr(0755,root,root) /sbin/udev.get_unique_drive_id.sh
-#%attr(0644,root,root) %{_sysconfdir}/udev/rules.d/52-udev-s390-persistent.rules
+%config %attr(0644,root,root) %{_sysconfdir}/udev/rules.d/51-udev-persistent.rules
+%attr(0755,root,root) /sbin/udev.get_persistent_device_name.sh
+%attr(0755,root,root) /sbin/udev.get_unique_hardware_path.sh
+%attr(0755,root,root) /sbin/udev.get_unique_drive_id.sh
+%if %{volume_id}
+%attr(0644,root,root) %{_sysconfdir}/udev/rules.d/52-udev-s390-persistent.rules
%endif
-%changelog
-* Fri May 20 2005 Bill Nottingham <notting at redhat.com> - 058-1
-- update to 058, fixes conflict with newer kernels (#158371)
-
-* Thu May 12 2005 Harald Hoyer <harald at redhat.com> - 057-6
-- polished persistent scripts
-
-* Thu May 5 2005 Bill Nottingham <notting at redhat.com> - 057-5
-- rebuild
-
-* Thu May 5 2005 Bill Nottingham <notting at redhat.com> - 057-4
-- better check for mounted tmpfs on /dev (#156862)
-
-* Wed Apr 27 2005 Peter Jones <pjones at redhat.com> - 057-3
-- use udevstart rather than udev for udevstart.static
-
-* Thu Apr 21 2005 Harald Hoyer <harald at redhat.com> - 057-2
-- added Inifiniband devices (bug #147035)
-- fixed pam_console.dev (bug #153250)
-
-* Mon Apr 18 2005 Harald Hoyer <harald at redhat.com> - 057-1
-- version 057
-
-* Fri Apr 15 2005 Dan Walsh <dwalsh at redhat.com> - 056-2
-- Fix SELinux during creation of Symlinks
-
-* Mon Apr 11 2005 Harald Hoyer <harald at redhat.com> - 056-1
-- updated to version 056
-- merged permissions in the rules file
-- added udevpermconv.sh to convert old permission files
+%endif
-* Mon Mar 28 2005 Warren Togami <wtogami at redhat.com> - 050-10
-- own default and net dirs (#151368 Hans de Goede)
+%changelog
+* Fri Oct 07 2005 Harald Hoyer <harald at redhat.com> - 039-10.FC3.8
+- added the detach_state patch from Alan Stern (bug #163438)
-* Mon Mar 07 2005 Warren Togami <wtogami at redhat.com> - 050-9
-- fixed rh#150462 (udev DRI permissions)
+* Tue Mar 8 2005 Harald Hoyer <harald at redhat.com> - 039-10.FC3.7
+- renamed dvb to dvb0
+- fixed #150533
+- set dri permissions to 0666
-* Wed Mar 02 2005 Harald Hoyer <harald at redhat.com> - 050-8
-- fixed rh#144598
+* Tue Dec 14 2004 Harald Hoyer <harald at redhat.com> - 039-10.FC3.6
+- fixed a case where reading /proc/ide/hd?/media returns EIO
+ (bug rh#142713)
+- added simple dvb rules
-* Fri Feb 18 2005 Harald Hoyer <harald at redhat.com> - 050-6
-- introducing /etc/udev/makedev.d/50-udev.nodes
-- glibcstatic patch modified to let gcc4 compile udev
+* Mon Dec 06 2004 Harald Hoyer <harald at redhat.com> - 039-10.FC3.5
+- fixed udev.rules for cdrom symlinks (bug 141897)
-* Thu Feb 10 2005 Harald Hoyer <harald at redhat.com> - 050-5
-- doh, reverted the start_udev devel version, which slipped in
+* Fri Dec 03 2004 Harald Hoyer <harald at redhat.com> - 039-10.FC3.4
+- added all partitions to ide floppy devs (bug 139939)
+- removed wait_for_sysfs info messages, which made users nervous
-* Thu Feb 10 2005 Harald Hoyer <harald at redhat.com> - 050-3
-- fixed forgotten " in udev.rules
+* Mon Nov 29 2004 Harald Hoyer <harald at redhat.com> - 039-10.FC3.4
+- MAKEDEV md devices in start_udev (bug 134264)
-* Tue Jan 11 2005 Harald Hoyer <harald at redhat.com> - 050-2
-- removed /dev/microcode, /dev/cpu/microcode is now the real node
-- cleaned up start_udev
+* Tue Nov 23 2004 Harald Hoyer <harald at redhat.com> - 039-10.FC3.4
+- added two rules, which create two additional symlinks
+ for s390 dasds (bug 131705)
-* Tue Jan 11 2005 Harald Hoyer <harald at redhat.com> - 050-1
-- version 050
-- /dev/cpu/0/microcode -> /dev/cpu/microcode
+* Mon Nov 22 2004 Jeremy Katz <katzj at redhat.com> - 039-10.FC3.3
+- requiring lvm2 works better (and mkinitrd already did, so this doesn't
+ add real requirements to the distro) (#138784)
-* Tue Dec 21 2004 Dan Walsh <dwalsh at redhat.com> - 048-4
-- Call selinux_restore to fix labeling problem in selinux
-- Fixes rh#142817
+* Mon Nov 22 2004 Harald Hoyer <harald at redhat.com> - 039-10.FC3.3
+- added Conflicts with lvm < 2 (bug 138784)
+- stopped opening of /etc/localtime a thousand times by setting
+ TZ environment variable in start_udev (bug 140188)
-* Tue Dec 21 2004 Harald Hoyer <harald at redhat.com> - 048-3
-- maybe fixed bug rh#143367
+* Fri Nov 19 2004 Jeremy Katz <katzj at redhat.com> - 039-10.FC3.3
+- conflict with lvm 1.x so that lvm2 to try to fix #138784
-* Thu Dec 16 2004 Harald Hoyer <harald at redhat.com> - 048-2
-- fixed a case where reading /proc/ide/hd?/media returns EIO
- (bug rh#142713)
-- changed all device node permissions of group "disk" to 0640
- (bug rh#110197)
-- remove $udev_db with -fr in case of a directory (bug rh#142962)
-
-* Mon Dec 13 2004 Harald Hoyer <harald at redhat.com> - 048-1
-- version 048
-- major specfile cleanup
+* Fri Nov 19 2004 Harald Hoyer <harald at redhat.com> - 039-10.FC3.3
+- fixed possible cause of bug 139989
+- added missing '"' in udev.rules for floppy devices (bug 139939)
-* Thu Nov 04 2004 Harald Hoyer <harald at redhat.com> - 042-1
-- version 042
+* Wed Nov 17 2004 Harald Hoyer <harald at redhat.com> - 039-10.FC3.2
+- turn off debugging (bug 139714)
* Thu Nov 04 2004 Harald Hoyer <harald at redhat.com> - 039-10
- speed improvement, scripts in rules are now executed only once,
- Previous message (by thread): rpms/passwd/devel .cvsignore, 1.13, 1.14 passwd.spec, 1.17, 1.18 sources, 1.15, 1.16
- Next message (by thread): rpms/sysstat/devel .cvsignore, 1.11, 1.12 sources, 1.11, 1.12 sysstat-4.0.1-config.patch, 1.1, 1.2 sysstat.spec, 1.29, 1.30 sysstat-4.0.7-lib64.patch, 1.1, NONE sysstat-5.0.0-history.patch, 1.1, NONE sysstat-5.0.5-debug.patch, 1.1, NONE sysstat-5.0.5-filename.patch, 1.1, NONE sysstat-5.0.5-gcc4fix.patch, 1.1, NONE sysstat-5.0.5-lib64init.patch, 1.2, NONE sysstat-5.0.5-overrun.patch, 1.1, NONE sysstat-5.0.5-statreset.patch, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-cvs-commits
mailing list