[PATCH] delete a bunch of files no longer needed.

Thanks to Kay for pointing it out.

diff --git a/etc/dev.d/default/dbus.dev b/etc/dev.d/default/dbus.dev
deleted file mode 100644 (file)
index 2fe1ed9..0000000
--- a/etc/dev.d/default/dbus.dev
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/sh
-
-if [ -f /etc/sysconfig/udev ]; then
-        . /etc/sysconfig/udev
-fi
-
-if [ -f /etc/conf.d/udev ]; then
-       . /etc/conf.d/udev
-fi
-
-[ "$UDEV_DBUS" != "yes" ] && exit 0
-
-if [ -x /usr/sbin/udev_dbus ]; then
-       exec /usr/sbin/udev_dbus "$@"
-fi

diff --git a/etc/dev.d/default/selinux.dev b/etc/dev.d/default/selinux.dev
deleted file mode 100644 (file)
index 9682658..0000000
--- a/etc/dev.d/default/selinux.dev
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/bin/sh
-
-if [ -f /etc/sysconfig/udev ]; then
-       . /etc/sysconfig/udev
-fi
-
-if [ -f /etc/conf.d/udev ]; then
-       . /etc/conf.d/udev
-fi
-
-[ "$UDEV_SELINUX" != "yes" ] && exit 0
-
-if [ -x /sbin/restorecon ]; then
-       if [ "$UDEV_LOG" = "yes" ] && [ -x /usr/bin/logger ]; then
-               /usr/bin/logger -p auth.debug "Restoring file security contexts for $DEVNAME"
-       fi
-       /sbin/restorecon $DEVNAME
-fi

diff --git a/etc/init.d/udev b/etc/init.d/udev
deleted file mode 100644 (file)
index 8726090..0000000
--- a/etc/init.d/udev
+++ /dev/null
@@ -1,132 +0,0 @@
-#! /bin/sh
-#
-# udev init script to setup /udev
-#
-# chkconfig: 2345 20 80
-# description: manage user-space device nodes in /udev
-
-. /etc/rc.d/init.d/functions
-
-. /etc/udev/udev.conf
-
-prog=udev
-sysfs_dir=/sys
-bin=/sbin/udev
-udevd=/sbin/udevd
-udev_root=/udev
-
-run_udev () {
-       # handle block devices and their partitions
-       for i in ${sysfs_dir}/block/*; do
-               # add each drive
-               export DEVPATH=${i#${sysfs_dir}}
-               $bin block &
-
-               # add each partition, on each device
-               for j in $i/*; do
-                       if [ -f $j/dev ]; then
-                               export DEVPATH=${j#${sysfs_dir}}
-                               $bin block &
-                       fi
-               done
-       done
-       # all other device classes
-       for i in ${sysfs_dir}/class/*; do
-               for j in $i/*; do
-                       if [ -f $j/dev ]; then
-                               export DEVPATH=${j#${sysfs_dir}}
-                               CLASS=`echo ${i#${sysfs_dir}} | \
-                                       cut --delimiter='/' --fields=3-`
-                               $bin $CLASS &
-                       fi
-               done
-       done
-       return 0
-}
-
-make_extra_nodes () {
-       # there are a few things that sysfs does not export for us.
-       # these things go here (and remember to remove them in 
-       # remove_extra_nodes()
-       #
-       # Thanks to Gentoo for the initial list of these.
-       ln -snf /proc/self/fd $udev_root/fd
-       ln -snf /proc/self/fd/0 $udev_root/stdin
-       ln -snf /proc/self/fd/1 $udev_root/stdout
-       ln -snf /proc/self/fd/2 $udev_root/stderr
-       ln -snf /proc/kcore $udev_root/core
-       #ln -snf /proc/asound/oss/sndstat $udev_root/sndstat
-}
-
-remove_extra_nodes () {
-       # get rid of the extra nodes created in make_extra_nodes()
-       rm $udev_root/fd
-       rm $udev_root/stdin
-       rm $udev_root/stdout
-       rm $udev_root/stderr
-       rm $udev_root/core
-       #rm $udev_root/sndstat
-}
-
-case "$1" in
-  start)
-       # don't use udev if sysfs is not mounted.
-       if [ ! -d $sysfs_dir/block ]; then
-               exit 1
-       fi
-       if [ ! -d $udev_root ]; then
-               mkdir $udev_root
-       fi
-
-       # remove the database if it is there as we always want to start fresh
-       if [ -f $udev_root/.udevdb ]; then
-               rm -rf $udev_root/.udevdb
-       fi
-
-       # propogate /udev from /sys - we only need this while we do not
-       # have initramfs and an early user-space with which to do early
-       # device bring up
-       export ACTION=add
-       echo -n $"Creating initial udev device nodes:"
-       run_udev
-       make_extra_nodes
-
-       # We want to start udevd ourselves if it isn't already running.  This
-       # lets udevd run at a sane nice level...
-       $udevd &
-
-       success /bin/true
-       echo
-       touch /var/lock/subsys/udev
-       ;;
-  stop)
-       # be careful
-       echo -n $"Removing udev device nodes: "
-       export ACTION=remove
-       run_udev 
-       remove_extra_nodes
-       success /bin/true
-       echo
-       rm -f /var/lock/subsys/udev
-       ;;
-  status)
-       if [ -f /var/lock/subsys/udev ]; then
-               echo $"$prog has run"
-               exit 0
-       fi
-       echo $"$prog is stopped"
-       exit 3
-       ;;
-  restart)
-       $0 stop
-       $0 start
-       ;;
-  reload)
-       # nothing to do here
-       ;;
-  *)
-       echo "Usage: $0 {start|stop|status|restart}"
-       exit 1
-esac
-
-exit 0

diff --git a/test/ignore_test b/test/ignore_test
deleted file mode 100644 (file)
index d22a4d7..0000000
--- a/test/ignore_test
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/bin/bash
-
-RULES=ignore_test.rules
-CONFIG=ignore_test.conf
-
-export UDEV_TEST=yes
-export SYSFS_PATH=$PWD/sys/
-export UDEV_CONFIG_FILE=$PWD/$CONFIG
-
-cat > $RULES << EOF
-KERNEL="ttyUSB0", NAME=""
-EOF
-
-cat > $CONFIG << EOF
-udev_root="$PWD/udev/"
-udev_db="$PWD/udev/.udevdb"
-udev_rules="$PWD/$RULES"
-udev_permissions="$PWD/udev.permissions"
-udev_log="true"
-EOF
-
-mkdir udev
-
-export DEVPATH=class/tty/ttyUSB0
-export ACTION=add
-
-../udev tty
-ls -l udev
-
-export ACTION=remove
-../udev tty
-ls -l udev
-
-rm $RULES
-rm $CONFIG
-rm -rf udev

diff --git a/test/label_test b/test/label_test
deleted file mode 100644 (file)
index fbb7309..0000000
--- a/test/label_test
+++ /dev/null
@@ -1,49 +0,0 @@
-#!/bin/bash
-
-RULES=label_test.rules
-CONFIG=label_test.conf
-
-export UDEV_TEST=yes
-export SYSFS_PATH=$PWD/sys/
-export UDEV_CONFIG_FILE=$PWD/$CONFIG
-
-cat > $RULES << EOF
-BUS="scsi", SYSFS{vendor}="IBM-ESXS", SYSFS{model}="ST336605LW   !#", NAME="boot_diskX%n"
-BUS="scsi", SYSFS{vendor}="IBM-ESXS", SYSFS{model}="ST336605LW    !#", NAME="boot_disk%n"
-EOF
-
-cat > $CONFIG << EOF
-udev_root="$PWD/udev/"
-udev_db="$PWD/udev/.udevdb"
-udev_rules="$PWD/$RULES"
-udev_permissions="$PWD/udev.permissions"
-EOF
-
-mkdir udev
-
-export ACTION=add
-export DEVPATH=block/sda
-
-../udev block
-ls -l udev
-
-export DEVPATH=block/sda/sda3
-
-../udev block
-ls -l udev
-
-export ACTION=remove
-export DEVPATH=block/sda
-
-../udev block
-ls -l udev
-
-export DEVPATH=block/sda/sda3
-
-../udev block
-ls -l udev
-
-
-rm $RULES
-rm $CONFIG
-rm -rf udev

diff --git a/test/modifier_test b/test/modifier_test
deleted file mode 100644 (file)
index c2b5ec6..0000000
--- a/test/modifier_test
+++ /dev/null
@@ -1,47 +0,0 @@
-#!/bin/bash
-
-RULES=modifier_test.rules
-CONFIG=modifier_test.conf
-
-export UDEV_TEST=yes
-export SYSFS_PATH=$PWD/sys/
-export UDEV_CONFIG_FILE=$PWD/$CONFIG
-
-cat > $RULES << EOF
-BUS="scsi", place="0:0:0:0", NAME="Major:%M:minor:%m:kernelnumber:%n:bus:%b"
-EOF
-
-cat > $CONFIG << EOF
-udev_root="$PWD/udev/"
-udev_db="$PWD/udev/.udevdb"
-udev_rules="$PWD/$RULES"
-udev_permissions="$PWD/udev.permissions"
-EOF
-
-mkdir udev
-
-export ACTION=add
-export DEVPATH=block/sda
-
-../udev block
-ls udev
-
-export DEVPATH=block/sda/sda3
-
-../udev block
-ls udev
-
-export ACTION=remove
-export DEVPATH=block/sda
-
-../udev block
-ls udev
-
-export DEVPATH=block/sda/sda3
-
-../udev block
-ls udev
-
-rm $RULES
-rm $CONFIG
-rm -rf udev

diff --git a/test/topo_test b/test/topo_test
deleted file mode 100644 (file)
index 77333a9..0000000
--- a/test/topo_test
+++ /dev/null
@@ -1,47 +0,0 @@
-#!/bin/bash
-
-RULES=replace_test.rules
-CONFIG=replace_test.conf
-
-export UDEV_TEST=yes
-export SYSFS_PATH=$PWD/sys/
-export UDEV_CONFIG_FILE=$PWD/$CONFIG
-
-cat > $RULES << EOF
-BUS="scsi", place="0:0:0:0", NAME="first_disk%n"
-EOF
-
-cat > $CONFIG << EOF
-udev_root="$PWD/udev/"
-udev_db="$PWD/udev/.udevdb"
-udev_rules="$PWD/$RULES"
-udev_permissions="$PWD/udev.permissions"
-EOF
-
-mkdir udev
-
-export ACTION=add
-export DEVPATH=block/sda
-
-../udev block
-ls udev
-
-export DEVPATH=block/sda/sda3
-
-../udev block
-ls udev
-
-export ACTION=remove
-export DEVPATH=block/sda
-
-../udev block
-ls udev
-
-export DEVPATH=block/sda/sda3
-
-../udev block
-ls udev
-
-rm $RULES
-rm $CONFIG
-rm -rf udev

diff --git a/test/udevd_test.sh b/test/udevd_test.sh
deleted file mode 100644 (file)
index 981a39d..0000000
--- a/test/udevd_test.sh
+++ /dev/null
@@ -1,88 +0,0 @@
-#!/bin/sh
-
-# add/rem/add/rem/add sequence of sda/sdb/sdc
-# a few days longer and the socket of my usb-flash-reader is gone :)
-
-export SEQNUM=0
-export ACTION=add
-export DEVPATH=/test/init
-./udevsend test
-
-export SEQNUM=3
-export ACTION=add
-export DEVPATH=/test/sdc
-./udevsend test
-
-export SEQNUM=1
-export ACTION=add
-export DEVPATH=/test/sda
-./udevsend test
-
-export SEQNUM=2
-export ACTION=add
-export DEVPATH=/test/sdb
-./udevsend test
-
-export SEQNUM=4
-export ACTION=remove
-export DEVPATH=/test/sdc
-./udevsend test
-
-export SEQNUM=5
-export ACTION=remove
-export DEVPATH=/test/sdb
-./udevsend test
-
-export SEQNUM=8
-export ACTION=add
-export DEVPATH=/test/sdb
-./udevsend test
-
-export SEQNUM=6
-export ACTION=remove
-export DEVPATH=/test/sda
-./udevsend test
-
-export SEQNUM=7
-export ACTION=add
-export DEVPATH=/test/sda
-#./udevsend test
-
-sleep 2
-
-export SEQNUM=9
-export ACTION=add
-export DEVPATH=/test/sdc
-./udevsend test
-
-export SEQNUM=11
-export ACTION=remove
-export DEVPATH=/test/sdb
-./udevsend test
-
-export SEQNUM=10
-export ACTION=remove
-export DEVPATH=/test/sdc
-./udevsend test
-
-export SEQNUM=13
-export ACTION=add
-export DEVPATH=/test/sda
-./udevsend test
-
-export SEQNUM=14
-export ACTION=add
-export DEVPATH=/test/sdb
-./udevsend test
-
-export SEQNUM=15
-export ACTION=add
-export DEVPATH=/test/sdc
-./udevsend test
-
-sleep 2
-
-export SEQNUM=12
-export ACTION=remove
-export DEVPATH=/test/sda
-./udevsend test

diff --git a/test/wait_for_sysfs_test.sh b/test/wait_for_sysfs_test.sh
deleted file mode 100644 (file)
index 9b80a42..0000000
--- a/test/wait_for_sysfs_test.sh
+++ /dev/null
@@ -1,44 +0,0 @@
-#! /bin/bash
-#
-
-# Check for missing binaries (stale symlinks should not happen)
-UDEV_BIN=../wait_for_sysfs
-test -x $UDEV_BIN || exit 5
-
-# Directory where sysfs is mounted
-SYSFS_DIR=/sys
-
-run_udev () {
-       # handle block devices and their partitions
-       for i in ${SYSFS_DIR}/block/*; do
-               # add each drive
-               export DEVPATH=${i#${SYSFS_DIR}}
-               $UDEV_BIN block
-
-               # add each partition, on each device
-               for j in $i/*; do
-                       if [ -f $j/dev ]; then
-                               export DEVPATH=${j#${SYSFS_DIR}}
-                               $UDEV_BIN block
-                       fi
-               done
-       done
-       # all other device classes
-       for i in ${SYSFS_DIR}/class/*; do
-               # try adding empty classes, just to test stuff...
-               export DEVPATH=${i#${SYSFS_DIR}}
-               CLASS=`echo ${i#${SYSFS_DIR}} | cut --delimiter='/' --fields=3-`
-               $UDEV_BIN $CLASS
-
-               for j in `ls $i/`; do
-                       x=$i/$j
-                       export DEVPATH=${x#${SYSFS_DIR}}
-                       CLASS=`echo ${i#${SYSFS_DIR}} | \
-                               cut --delimiter='/' --fields=3-`
-                       $UDEV_BIN $CLASS
-               done
-       done
-}
-
-export ACTION=add
-run_udev