remove example rules and put the dev.d stuff into the run_directory folder

The distro rules are the best example you can get and the use of
dev.d/ is no longer recommended.

Signed-off-by: Kay Sievers <kay.sievers@suse.de>

6 files changed, 6 insertions, 184 deletions

diff --git a/etc/dev.d/default/pam_console.dev b/etc/dev.d/default/pam_console.dev
deleted file mode 100644
index 4c69ea3576..0000000000
--- a/etc/dev.d/default/pam_console.dev
+++ /dev/null
@@ -1,52 +0,0 @@
-#!/bin/sh
-
-# Fedora solution to set the ownership/permissions of s device to the local
-# logged in user. Uses the program pam_console_setowner to match the names of
-# the device node and the symlinks against a device list and applies the
-# configured ownership and permission to the node.
-
-[ "$ACTION" != "add" ] && exit 0
-
-# we do not have console users in rc.sysinit
-[ -n "$IN_INITLOG" ] && exit 0
-
-if [ -x /sbin/pam_console_setowner -a -f /var/run/console/console.lock \
-	-a -e "$DEVNAME" ]; then
-
-	if [ -x /usr/bin/logger ]; then
-	    LOGGER=/usr/bin/logger
-	elif [ -x /bin/logger ]; then
-	    LOGGER=/bin/logger
-	else
-	    unset LOGGER
-	fi
-	#
-	# for diagnostics
-	#
-	if [ -t 1 -o -z "$LOGGER" ]; then
-	    mesg () {
-	        echo "$@"
-	    }
-	else
-	    mesg () {
-	        $LOGGER -t $(basename $0)"[$$]" "$@"
-	    }
-	fi
-
-	debug_mesg () {
-	    test "$udev_log" = "" -o "$udev_log" = "no" && return
-	    mesg "$@"
-	}
-
-	if [ -f /etc/udev/udev.conf ]; then
-        	. /etc/udev/udev.conf
-	fi
-
-	SYMLINKS=""
-	for i in $(/usr/bin/udevinfo -q symlink -p "$DEVPATH"); do
-		[ $? -gt 0 ] && break
-		SYMLINKS="$SYMLINKS ${udev_root%%/}/$i"
-	done
-	debug_mesg "Restoring console permissions for $DEVNAME $SYMLINKS"
-	/sbin/pam_console_setowner "$DEVNAME" $SYMLINKS
-fi
diff --git a/etc/dev.d/net/hotplug.dev b/etc/dev.d/net/hotplug.dev
deleted file mode 100644
index e195b0f034..0000000000
--- a/etc/dev.d/net/hotplug.dev
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/bin/sh
-#
-# Script to ensure that any network device that udev renames
-# still gets the hotplug script run with the proper name.
-#
-# Released under the GPL v2
-#
-# Copyright (C) 2004 Greg Kroah-Hartman <greg@kroah.com>
-#
-
-# Do nothing if udev handles hotplug.d.
-if [ "$MANAGED_EVENT" == "1" ]; then
-	exit 0
-fi
-
-# ok, we have renamed this device, so let the network hotplug script
-# know about it to setup the device properly...
-if [ -f /etc/hotplug.d/default/default.hotplug ]; then
-	exec /etc/hotplug.d/default/default.hotplug net
-fi
-
diff --git a/etc/dev.d/snd/controlC0/alsa.dev b/etc/dev.d/snd/controlC0/alsa.dev
deleted file mode 100644
index 642dde4f36..0000000000
--- a/etc/dev.d/snd/controlC0/alsa.dev
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh -e
-exec /usr/sbin/alsactl restore 0
diff --git a/etc/udev/udev.rules b/etc/udev/udev.rules
deleted file mode 100644
index bebf74802f..0000000000
--- a/etc/udev/udev.rules
+++ /dev/null
@@ -1,46 +0,0 @@
-# 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.
-#
-# See the udev.rules.examples file for more examples of how to create rules
-#
-
-# if this is a ide cdrom, name it the default name, and create a symlink to cdrom
-BUS=="ide", KERNEL=="*[!0-9]", PROGRAM="/bin/cat /proc/ide/%k/media", RESULT="cdrom", NAME="%k", SYMLINK+="cdrom"
-
-# DRI devices always go into a subdirectory (as per the LSB spec)
-KERNEL=="card*",		NAME="dri/card%n"
-
-# alsa devices
-KERNEL=="controlC[0-9]*",	NAME="snd/%k"
-KERNEL=="hw[CD0-9]*",		NAME="snd/%k"
-KERNEL=="pcm[CD0-9cp]*",	NAME="snd/%k"
-KERNEL=="midiC[D0-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"
-
-# USB devices
-KERNEL=="hiddev*",		NAME="usb/%k"
-KERNEL=="auer*",		NAME="usb/%k"
-KERNEL=="legousbtower*",	NAME="usb/%k"
-KERNEL=="dabusb*",		NAME="usb/%k"
-BUS=="usb", KERNEL=="lp[0-9]*",	NAME="usb/%k"
-
-# CAPI devices
-KERNEL=="capi",			NAME="capi20", SYMLINK+="isdn/capi20"
-KERNEL=="capi*",		NAME="capi/%n"
-
-# Network devices
-KERNEL=="tun",			NAME="net/%k"
-
-# raw devices
-KERNEL=="raw[0-9]*",		NAME="raw/%k"
-
-# emulate dev.d/
-RUN="/sbin/udev_run_devd"
diff --git a/etc/udev/udev.rules.devfs b/etc/udev/udev.rules.devfs
index 867f95029c..b7b2c4e12d 100644
--- a/etc/udev/udev.rules.devfs
+++ b/etc/udev/udev.rules.devfs
@@ -1,3 +1,9 @@
+# The use of these rules is not recommended or supported.
+# In a world where devices can come and go at any time, the devfs scheme
+# of simple device enumeration does not help _anything_. Just forget about
+# it. Use custom rules to name your device or look at the persistent device
+# naming scheme, which is implemented for disks and add your subsystem.
+
 # 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.
 
diff --git a/etc/udev/udev.rules.examples b/etc/udev/udev.rules.examples
deleted file mode 100644
index 1c4527891a..0000000000
--- a/etc/udev/udev.rules.examples
+++ /dev/null
@@ -1,63 +0,0 @@
-# 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.
-#
-#
-# These are some example rules that you could use to name your devices.
-#
-# If anyone has any other examples that they think should be in here for others
-# to use, please send them to greg@kroah.com
-#
-
-# Looking for scsi bus id 42:0:0:1
-BUS=="scsi", PROGRAM="/bin/echo -n test-%b", RESULT=="test-42:0:0:1", NAME="%c"
-
-# A usb camera.
-BUS=="usb", SYSFS{vendor}=="FUJIFILM", SYSFS{model}=="M100", NAME="camera%n"
-
-# USB Epson printer to be called lp_epson
-BUS=="usb", SYSFS_serial=="HXOLL0012202323480", NAME="lp_epson"
-
-# USB HP printer to be called lp_hp
-BUS=="usb", SYSFS{serial}=="W09090207101241330", NAME="lp_hp"
-
-# sound card with PCI bus id 00:0b.0 to be the first sound card
-BUS=="pci", ID=="00:0b.0", NAME="dsp"
-
-# sound card with PCI bus id 00:07.1 to be the second sound card
-BUS=="pci", ID=="00:07.1", NAME="dsp1" 
-
-# ttyUSB1 should always be called visor
-KERNEL=="ttyUSB1", NAME="visor"
-KERNEL=="ttyUSB0", NAME="pl2303"
-
-# a devfs like way to name some tty devices
-KERNEL=="ttyS*", NAME="tts/%n"
-KERNEL=="tty*", NAME="vc/%n"
-
-# if this is a ide cdrom, name it the default name, and create a symlink to cdrom
-BUS=="ide", KERNEL=="*[!0-9]", PROGRAM="/bin/cat /proc/ide/%k/media", RESULT=="cdrom", NAME="%k", SYMLINK+="cdrom"
-
-# DRI devices always go into a subdirectory (as per the LSB spec)
-KERNEL=="card*", NAME="dri/card%n"
-
-# create all 15 partitions of a USB flash card reader
-BUS=="scsi", SYSFS{model}=="CF/MD", NAME{all_partitions}="compactflash"
-
-# 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"
-
-# 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"
-
-# emulate dev.d/
-RUN="/sbin/udev_run_devd"
-