24 files changed, 91 insertions, 53 deletions
diff --git a/source/a/udev/config/modprobe.d/8139cp.conf b/source/a/eudev/config/modprobe.d/8139cp.conf
index 65f0af0d1..65f0af0d1 100644
--- a/source/a/udev/config/modprobe.d/8139cp.conf
+++ b/source/a/eudev/config/modprobe.d/8139cp.conf
diff --git a/source/a/udev/config/modprobe.d/README b/source/a/eudev/config/modprobe.d/README
index 43355e826..43355e826 100644
--- a/source/a/udev/config/modprobe.d/README
+++ b/source/a/eudev/config/modprobe.d/README
diff --git a/source/a/udev/config/modprobe.d/bcm43xx.conf b/source/a/eudev/config/modprobe.d/bcm43xx.conf
index 55b3c2abc..55b3c2abc 100644
--- a/source/a/udev/config/modprobe.d/bcm43xx.conf
+++ b/source/a/eudev/config/modprobe.d/bcm43xx.conf
diff --git a/source/a/udev/config/modprobe.d/eepro100.conf b/source/a/eudev/config/modprobe.d/eepro100.conf
index a7ca4aaea..a7ca4aaea 100644
--- a/source/a/udev/config/modprobe.d/eepro100.conf
+++ b/source/a/eudev/config/modprobe.d/eepro100.conf
diff --git a/source/a/udev/config/modprobe.d/eth1394.conf b/source/a/eudev/config/modprobe.d/eth1394.conf
index a2f475afd..a2f475afd 100644
--- a/source/a/udev/config/modprobe.d/eth1394.conf
+++ b/source/a/eudev/config/modprobe.d/eth1394.conf
diff --git a/source/a/udev/config/modprobe.d/evbug.conf b/source/a/eudev/config/modprobe.d/evbug.conf
index 0af0a83c6..0af0a83c6 100644
--- a/source/a/udev/config/modprobe.d/evbug.conf
+++ b/source/a/eudev/config/modprobe.d/evbug.conf
diff --git a/source/a/udev/config/modprobe.d/framebuffers.conf b/source/a/eudev/config/modprobe.d/framebuffers.conf
index 770ce420a..770ce420a 100644
--- a/source/a/udev/config/modprobe.d/framebuffers.conf
+++ b/source/a/eudev/config/modprobe.d/framebuffers.conf
diff --git a/source/a/udev/config/modprobe.d/hostap.conf b/source/a/eudev/config/modprobe.d/hostap.conf
index 4254d3daa..4254d3daa 100644
--- a/source/a/udev/config/modprobe.d/hostap.conf
+++ b/source/a/eudev/config/modprobe.d/hostap.conf
diff --git a/source/a/udev/config/modprobe.d/hw_random.conf b/source/a/eudev/config/modprobe.d/hw_random.conf
index b912e0125..b912e0125 100644
--- a/source/a/udev/config/modprobe.d/hw_random.conf
+++ b/source/a/eudev/config/modprobe.d/hw_random.conf
diff --git a/source/a/udev/config/modprobe.d/isapnp.conf b/source/a/eudev/config/modprobe.d/isapnp.conf
index a89ad6bb7..a89ad6bb7 100644
--- a/source/a/udev/config/modprobe.d/isapnp.conf
+++ b/source/a/eudev/config/modprobe.d/isapnp.conf
diff --git a/source/a/udev/config/modprobe.d/isdn.conf b/source/a/eudev/config/modprobe.d/isdn.conf
index 7f7367536..7f7367536 100644
--- a/source/a/udev/config/modprobe.d/isdn.conf
+++ b/source/a/eudev/config/modprobe.d/isdn.conf
diff --git a/source/a/udev/config/modprobe.d/oss.conf b/source/a/eudev/config/modprobe.d/oss.conf
index 52ed2f59c..52ed2f59c 100644
--- a/source/a/udev/config/modprobe.d/oss.conf
+++ b/source/a/eudev/config/modprobe.d/oss.conf
diff --git a/source/a/udev/config/modprobe.d/pcspkr.conf b/source/a/eudev/config/modprobe.d/pcspkr.conf
index 66de6b749..66de6b749 100644
--- a/source/a/udev/config/modprobe.d/pcspkr.conf
+++ b/source/a/eudev/config/modprobe.d/pcspkr.conf
diff --git a/source/a/udev/config/modprobe.d/psmouse.conf b/source/a/eudev/config/modprobe.d/psmouse.conf
index cc414141e..cc414141e 100644
--- a/source/a/udev/config/modprobe.d/psmouse.conf
+++ b/source/a/eudev/config/modprobe.d/psmouse.conf
diff --git a/source/a/udev/config/modprobe.d/scsi-sata-controllers.conf b/source/a/eudev/config/modprobe.d/scsi-sata-controllers.conf
index 61470416d..61470416d 100644
--- a/source/a/udev/config/modprobe.d/scsi-sata-controllers.conf
+++ b/source/a/eudev/config/modprobe.d/scsi-sata-controllers.conf
diff --git a/source/a/udev/config/modprobe.d/sound-modems.conf b/source/a/eudev/config/modprobe.d/sound-modems.conf
index f458346de..f458346de 100644
--- a/source/a/udev/config/modprobe.d/sound-modems.conf
+++ b/source/a/eudev/config/modprobe.d/sound-modems.conf
diff --git a/source/a/udev/config/modprobe.d/tulip.conf b/source/a/eudev/config/modprobe.d/tulip.conf
index 64b6a5ca5..64b6a5ca5 100644
--- a/source/a/udev/config/modprobe.d/tulip.conf
+++ b/source/a/eudev/config/modprobe.d/tulip.conf
diff --git a/source/a/udev/config/modprobe.d/usb-controller.conf b/source/a/eudev/config/modprobe.d/usb-controller.conf
index f5e4e5025..f5e4e5025 100644
--- a/source/a/udev/config/modprobe.d/usb-controller.conf
+++ b/source/a/eudev/config/modprobe.d/usb-controller.conf
diff --git a/source/a/udev/config/modprobe.d/via-ircc.conf b/source/a/eudev/config/modprobe.d/via-ircc.conf
index 3dfa57315..3dfa57315 100644
--- a/source/a/udev/config/modprobe.d/via-ircc.conf
+++ b/source/a/eudev/config/modprobe.d/via-ircc.conf
diff --git a/source/a/udev/config/modprobe.d/watchdog.conf b/source/a/eudev/config/modprobe.d/watchdog.conf
index 66d1f837d..22a5c829d 100644
--- a/source/a/udev/config/modprobe.d/watchdog.conf
+++ b/source/a/eudev/config/modprobe.d/watchdog.conf
@@ -8,8 +8,12 @@ blacklist acquirewdt
 blacklist advantechwdt
 blacklist alim1535_wdt
 blacklist alim7101_wdt
+blacklist bcm7038_wdt
+blacklist cadence_wdt
 blacklist cpu5wdt
+blacklist dw_wdt
 blacklist eurotechwdt
+blacklist f71808e_wdt
 blacklist hpwdt
 blacklist i6300esb
 blacklist i8xx_tco
@@ -17,22 +21,34 @@ blacklist iTCO_vendor_support
 blacklist iTCO_wdt
 blacklist ib700wdt
 blacklist ibmasr
+blacklist ie6xx_wdt
 blacklist it8712f_wdt
+blacklist it87_wdt
 blacklist machzwd
+blacklist max63xx_wdt
+blacklist mena21_wdt
+blacklist menf21bmc_wdt
 blacklist mixcomwd
+blacklist nv_tco
 blacklist pc87413_wdt
 blacklist pcwd
 blacklist pcwd_pci
 blacklist pcwd_usb
+blacklist retu_wdt
+blacklist rn5t618_wdt
 blacklist sbc60xxwdt
 blacklist sbc7240_wdt
 blacklist sbc8360
 blacklist sbc_epx_c3
+blacklist sbc_fitpc2_wdt
 blacklist sc1200wdt
 blacklist sc520_wdt
+blacklist sch311x_wdt
 blacklist scx200_wdt
 blacklist smsc37b787_wdt
 blacklist softdog
+blacklist sp5100_tco
+blacklist via_wdt
 blacklist w83627hf_wdt
 blacklist w83697hf_wdt
 blacklist w83877f_wdt
diff --git a/source/a/udev/config/rc.d/rc.udev.new b/source/a/eudev/config/rc.d/rc.udev.new
index f000e938e..aaa1eb155 100644..100755
--- a/source/a/udev/config/rc.d/rc.udev.new
+++ b/source/a/eudev/config/rc.d/rc.udev.new
@@ -5,57 +5,47 @@
 
 PATH="/sbin:/bin"
 
-. /etc/udev/udev.conf
-
-# remove trailing slash from udev_root
-UDEV_ROOT=$(echo "${udev_root}" |sed 's/\/*$//')
-
 check_mounted() {
   grep -E -q "^[^[:space:]]+ $1 $2" /proc/mounts
   return $?	
 }
 
 mount_devpts() {
-  if ! check_mounted $UDEV_ROOT/pts devpts ; then
-    mkdir $UDEV_ROOT/pts 2> /dev/null
-    mount -n -o mode=0620,gid=5 -t devpts devpts $UDEV_ROOT/pts
+  if ! check_mounted /dev/pts devpts ; then
+    mkdir /dev/pts 2> /dev/null
+    mount -n -o mode=0620,gid=5 -t devpts devpts /dev/pts
+  fi
+}
+
+mount_devshm() {
+  if ! check_mounted /dev/shm tmpfs ; then
+    mkdir /dev/shm 2> /dev/null
+    mount /dev/shm
   fi
 }
 
 case "$1" in
     start)
-        # Sanity check #1, udev requires that the kernel support devtmpfs:
-        if ! grep -wq devtmpfs /proc/filesystems ; then
-          echo "Sorry, but you need devtmpfs support in the kernel to use udev."
-          echo "Both of these options are needed:  CONFIG_DEVTMPFS=y CONFIG_DEVTMPFS_MOUNT=y"
-          echo
-          echo "FATAL:  Refusing to run /etc/rc.d/rc.udev."
-          sleep 10
-          exit 1
-        fi
-
-	# Sanity check #2, udev requires that the kernel support tmpfs:
+	# Sanity check #1, udev requires that the kernel support tmpfs:
         if ! grep -wq tmpfs /proc/filesystems ; then
           echo "Sorry, but you need tmpfs support in the kernel to use udev."
           echo
           echo "FATAL:  Refusing to run /etc/rc.d/rc.udev."
-          sleep 10
           exit 1
         fi
 
-        # Sanity check #3, make sure that a 2.6.x kernel is new enough:
+        # Sanity check #2, make sure that a 2.6.x kernel is new enough:
         if [ "$(uname -r | cut -f 1,2 -d .)" = "2.6" ]; then
           if [ "$(uname -r | cut -f 3 -d . | sed 's/[^[:digit:]].*//')" -lt "32" ]; then
             echo "Sorry, but you need a 2.6.32+ kernel to use this udev."
             echo "Your kernel version is only $(uname -r)."
             echo
             echo "FATAL:  Refusing to run /etc/rc.d/rc.udev."
-            sleep 10
             exit 1
           fi
         fi
 
-        # Sanity check #4, make sure the udev package was not removed.  If udevd
+        # Sanity check #3, make sure the udev package was not removed.  If udevd
         # is not there, this will also shut off this script to prevent further
         # problems:
         if [ ! -x /sbin/udevd ]; then
@@ -63,7 +53,6 @@ case "$1" in
           echo "No udevd daemon found."
           echo "Turning off udev:  chmod 644 /etc/rc.d/rc.udev"
           echo "FATAL:  Refusing to run /etc/rc.d/rc.udev."
-          sleep 10
           exit 1
         fi
 
@@ -73,36 +62,54 @@ case "$1" in
         fi
 
 	if grep -qw devtmpfs /proc/filesystems ; then
-	   if ! check_mounted $UDEV_ROOT devtmpfs ; then
-		# umount shm if needed
-		check_mounted $UDEV_ROOT/shm tmpfs && umount -l $UDEV_ROOT/shm
+          if ! check_mounted /dev devtmpfs ; then
+            # umount shm if needed
+            check_mounted /dev/shm tmpfs && umount -l /dev/shm
 
-		# Umount pts if needed, we will remount it later:
-		check_mounted $UDEV_ROOT/pts devpts && umount -l $UDEV_ROOT/pts
+            # Umount pts if needed, we will remount it later:
+            check_mounted /dev/pts devpts && umount -l /dev/pts
 		
-		# Mount tmpfs on $UDEV_ROOT:
-		mount -n -t devtmpfs devtmpfs $UDEV_ROOT 
-	   fi
+            # Mount tmpfs on /dev:
+            mount -n -t devtmpfs devtmpfs /dev 
+          fi
 	else 
-		# Mount tmpfs on $UDEV_ROOT:
-		if ! check_mounted $UDEV_ROOT tmpfs ; then
-		  # umount shm if needed
-		  check_mounted $UDEV_ROOT/shm tmpfs && umount -l $UDEV_ROOT/shm
+          # Mount tmpfs on /dev:
+          if ! check_mounted /dev tmpfs ; then
+            # umount shm if needed
+            check_mounted /dev/shm tmpfs && umount -l /dev/shm
 
-		  # Umount pts if needed, we will remount it later:
-		  check_mounted $UDEV_ROOT/pts devpts && umount -l $UDEV_ROOT/pts
-		
-		  # Mount tmpfs on $UDEV_ROOT:
-		  # the -n is because we don't want $UDEV_ROOT umounted when
-		  # someone (rc.[06]) calls umount -a
-		  mount -n -o mode=0755 -t tmpfs tmpfs $UDEV_ROOT 
+            # Umount pts if needed, we will remount it later:
+            check_mounted /dev/pts devpts && umount -l /dev/pts
 		
-		fi
-	fi
+            # Mount tmpfs on /dev:
+            # the -n is because we don't want /dev umounted when
+            # someone (rc.[06]) calls umount -a
+            mount -n -o mode=0755 -t tmpfs tmpfs /dev 
+          fi
+        fi
+
 	# Mount devpts
 	mount_devpts
+	mount_devshm
 
         if ! /sbin/pidof udevd 1>/dev/null 2>/dev/null; then # start udevd
+          echo "Creating static nodes in /dev."
+          kmod static-nodes -f tmpfiles --output /run/static-nodes
+          grep "^d\ " /run/static-nodes | while read line ; do
+            mkdir -p -m $(echo $line | cut -f 3 -d ' ') $(echo $line | cut -f 2 -d ' ')
+          done
+          grep -v "^d\ " /run/static-nodes | while read line ; do
+            mknod -m $(echo $line | cut -f 3 -d ' ') \
+            $(echo $line | cut -f 2 -d ' ') \
+            $(echo $line | cut -b1 ) \
+            $(echo $line | cut -f 7 -d ' ' | cut -f 1 -d :) \
+            $(echo $line | cut -f 7 -d ' ' | cut -f 2 -d :) 2> /dev/null
+          done
+          rm -f /run/static-nodes
+          # Add any system defined additional device nodes:
+          cp --preserve=all --recursive --update /lib/udev/devices/* /dev 2> /dev/null
+          # Add any locally defined additional device nodes:
+          cp --preserve=all --recursive --update /etc/udev/devices/* /dev 2> /dev/null
           echo "Starting udevd:  /sbin/udevd --daemon"
           /sbin/udevd --daemon
           # Since udev is just now being started we want to use add events:
@@ -111,12 +118,12 @@ case "$1" in
           /sbin/udevadm trigger --type=subsystems --action=add
           /sbin/udevadm trigger --type=devices --action=add
         else # trigger changes for already running udevd
-          # If the persistent rules files do not exist, trigger an add event:
-          if [ ! -r /etc/udev/rules.d/70-persistent-net.rules -o ! -r /etc/udev/rules.d/70-persistent-cd.rules ]; then
+          # If the persistent network rules file does not exist, trigger an add event:
+          if [ ! -r /etc/udev/rules.d/70-persistent-net.rules ]; then
             # Test that we can actually write to the directory first:
             if touch /etc/udev/rules.d/testfile 2> /dev/null ; then
               rm -f /etc/udev/rules.d/testfile
-              # This should add persistent net/cd rules:
+              # This should add persistent net rules:
               echo "Triggering udev to write persistent rules to /etc/udev/rules.d/"
               /sbin/udevadm trigger --type=devices --action=add
               sleep 3
@@ -126,9 +133,14 @@ case "$1" in
               # rules at every boot.
               # To force another attempt, delete the file(s).
               touch /etc/udev/rules.d/70-persistent-net.rules
-              touch /etc/udev/rules.d/70-persistent-cd.rules
             fi
           fi
+          # Update the hardware database index (/etc/udev/hwdb.bin), if possible:
+          if touch /etc/udev/testfile 2> /dev/null ; then
+            rm -f /etc/udev/testfile
+            echo "Updating hardware database index:  /sbin/udevadm hwdb --update"
+            /sbin/udevadm hwdb --update
+          fi
           # Since udevd is running, most of the time we only need change events:
           echo "Triggering udev events:  /sbin/udevadm trigger --action=change"
           /sbin/udevadm trigger --type=subsystems --action=change
@@ -158,13 +170,12 @@ case "$1" in
     reload)
 	echo "Reloading udev rules"
 	udevadm control --reload
-	cp --preserve=all --recursive --update /lib/udev/devices/* $UDEV_ROOT
 	;;
     force-reload)
-	echo "Updating all available device nodes in $UDEV_ROOT"
+	echo "Updating all available device nodes in /dev"
 	udevadm control --reload
-	rm -rf $UDEV_ROOT/.udev $UDEV_ROOT/disk
-	cp --preserve=all --recursive --update /lib/udev/devices/* $UDEV_ROOT
+	rm -rf /dev/.udev /dev/disk
+	cp --preserve=all --recursive --update /lib/udev/devices/* /dev 2> /dev/null
 	;;
 	
     *)
diff --git a/source/a/udev/config/rules.d/40-slackware.rules b/source/a/eudev/config/rules.d/40-slackware.rules
index 9e8c63428..3240b29ef 100644
--- a/source/a/udev/config/rules.d/40-slackware.rules
+++ b/source/a/eudev/config/rules.d/40-slackware.rules
@@ -20,3 +20,6 @@ KERNEL=="rfkill", GROUP:="netdev", MODE:="0664"
 # Mount fusectl filesystem
 KERNEL=="fuse", ACTION=="add", RUN+="/bin/mount -t fusectl fusectl /sys/fs/fuse/connections"
 
+# Set default perms for /dev/ppp:
+KERNEL=="ppp", MODE="0660", GROUP="dialout", OPTIONS+="static_node=ppp"
+
diff --git a/source/a/udev/config/rules.d/65-permissions.rules b/source/a/eudev/config/rules.d/65-permissions.rules
index 6f82b0f36..6f82b0f36 100644
--- a/source/a/udev/config/rules.d/65-permissions.rules
+++ b/source/a/eudev/config/rules.d/65-permissions.rules
diff --git a/source/a/eudev/config/udev.conf b/source/a/eudev/config/udev.conf
new file mode 100644
index 000000000..e507e116d
--- /dev/null
+++ b/source/a/eudev/config/udev.conf
@@ -0,0 +1,8 @@
+# /etc/udev/udev.conf
+
+# This file can be used to override some of udev's default values
+# See udev(7) for details
+
+# udev_log - The initial syslog(3) priority: "err", "info", "debug"
+udev_log="err"
+