Changeset a6cd72e

Timestamp:

Feb 21, 2006, 1:37:37 AM (18 years ago)

Author:

Jim Gifford <clfs@…>

Branches:

clfs-1.2, clfs-2.1, clfs-3.0.0-systemd, clfs-3.0.0-sysvinit, master, systemd, sysvinit

Children:

128c984

Parents:

ce36880

Message:

r861@server (orig r859): jim | 2005-12-06 22:41:11 -0800

r994@server: jim | 2005-12-06 22:39:42 -0800
Updates from 077 OpenSuse? Package

Location:

udev

Files:

• 05-udev-early.rules (added)
• 10-wait-for-sysfs.rules (deleted)
• 50-udev.rules (modified) (7 diffs)
• Makefile (modified) (2 diffs)
• README.debug (added)
• boot.udev (modified) (6 diffs)
• boot.udev_retry (modified) (1 diff)
• ide.sh (moved) (moved from udev/load_ide_modules.sh) (2 diffs, 1 prop)
• input.sh (added)
• input_device.sh (deleted)
• load_floppy_module.sh (modified) (1 diff)
• mount.sh (modified) (5 diffs)

udev/50-udev.rules

@@ -14 +14 @@
 #
 ########################################################################
-
-# ignore these events until someone needs them
-SUBSYSTEM=="drivers",           OPTIONS="last_rule"
-SUBSYSTEM=="module",            OPTIONS="last_rule"
 
 # console
@@ -56 +52 @@
 SUBSYSTEM=="dvb", PROGRAM="/bin/sh -c 'K=%k; K=$${K#dvb}; printf dvb/adapter%%i/%%i $${K%%%%.*} $${K#*.}'", NAME="%c", GROUP="video"
 
-# Kino jogshuttle support
-SUBSYSTEM=="usb", ACTION=="add", ENV{PRODUCT}=="b33/10/*", RUN+="/usr/bin/killall --quiet -USR2 kino"
-SUBSYSTEM=="usb", ACTION=="add", ENV{PRODUCT}=="5f3/240/*", RUN+="/usr/bin/killall --quiet -USR2 kino"
-
 # input devices
 KERNEL=="mice",                 NAME="input/%k", MODE="0640"
@@ -68 +60 @@
 KERNEL=="uinput",               NAME="input/%k", MODE="0600"
 KERNEL=="lirc0",                NAME="%k", SYMLINK+="lirc"
-KERNEL=="input[0-9]*",          RUN+="/lib/udev/input_device.sh"
-KERNEL=="input[0-9]*",          ACTION=="add", ENV{ABS}=="[1-9]*", RUN+="/sbin/modprobe joydev"
+KERNEL=="input[0-9]*", ACTION=="add", RUN+="input.sh"
 
 # printer
@@ -94 +85 @@
 # 167 /dev/specialix_sxctl Specialix serial control
 KERNEL=="sxctl",                NAME="specialix_sxctl", SYMLINK+="%k"
+
+# network
+KERNEL=="tun", NAME="net/%k", MODE="0600"
 
 # misc devices
@@ -121 +115 @@
 KERNEL=="auer[0-9]*"            NAME="usb/%k"
 
+# packet writing interface
 KERNEL=="pktcdvd",              NAME="pktcdvd/control"
 KERNEL=="pktcdvd[0-9]*",        NAME="pktcdvd/%k"
 
 # fix floppy devices
-KERNEL=="nvram", ACTION=="add", RUN+="/lib/udev/load_floppy_module.sh"
-KERNEL=="fd*", ACTION=="add", SYSFS{device/cmos}=="*", RUN+="/lib/udev/create_floppy_devices -c -t $sysfs{device/cmos} -m %M /dev/%k"
-KERNEL=="fd*", ACTION=="remove", RUN+="/lib/udev/remove_floppy_devices.sh %k"
+KERNEL=="nvram", ACTION=="add", RUN+="load_floppy_module.sh"
+KERNEL=="fd[0-9]*", ACTION=="add", SYSFS{device/cmos}=="*", RUN+="create_floppy_devices -c -t $sysfs{device/cmos} -m %M /dev/%k"
+KERNEL=="fd[0-9]*", ACTION=="remove", RUN+="/bin/rm -f $root/%k*"
 
 # block devices
@@ -143 +138 @@
 SUBSYSTEM=="scsi_device", ACTION=="add", RUN+="/sbin/modprobe sg"
 
-# IDE modules
-SUBSYSTEM=="ide", ACTION=="add", RUN+="/lib/udev/load_ide_modules.sh"
+# load IDE modules
+SUBSYSTEM=="ide", ACTION=="add", RUN+="ide.sh"
 
 # device mapper
-KERNEL=="device-mapper", ACTION=="add", NAME="%k", SYMLINK+="mapper/control"
+KERNEL=="device-mapper", NAME="%k", SYMLINK+="mapper/control"
 
 # check fstab and possibly mount
-SUBSYSTEM=="block", KERNEL=="sd*[0-9]|hd*[0-9]", ACTION=="add", RUN+="/lib/udev/mount.sh"
+SUBSYSTEM=="block", ACTION=="add", KERNEL=="sd*[0-9]|hd*[0-9]", RUN+="mount.sh"
 
 # misc storage devices (non-block)
@@ -179 +174 @@
 SUBSYSTEM=="usb_device", PROGRAM="/bin/sh -c 'K=%k; K=$${K#usbdev}; printf bus/usb/%%03i/%%03i $${K%%%%.*} $${K#*.}'", NAME="%c", MODE="0644"
 
-# firmware loader
-SUBSYSTEM=="firmware", ACTION=="add", RUN+="/lib/udev/firmware.sh"
+# kernel firmware loader
+SUBSYSTEM=="firmware", ACTION=="add", RUN+="firmware.sh"

udev/Makefile

@@ -10 +10 @@
 
 rules:
-        install -m ${RULESMODE} ${DESTDIR}/etc/udev/rules.d/10-wait-for-sysfs.rules
+        install -m ${RULESMODE} ${DESTDIR}/etc/udev/rules.d/05-udev-early.rules
         install -m ${RULESMODE} ${DESTDIR}/etc/udev/rules.d/50-udev.rules
         install -m ${RULESMODE} ${DESTDIR}/etc/udev/rules.d/60-persistent.rules
@@ -19 +19 @@
         install -m ${SCRIPTMODE) ${DESTDIR}/lib/udev/remove_floppy_devices.sh
         install -m ${SCRIPTMODE) ${DESTDIR}/lib/udev/load_floppy_module.sh
-        install -m ${SCRIPTMODE) ${DESTDIR}/lib/udev/load_ide_modules.sh
+        install -m ${SCRIPTMODE) ${DESTDIR}/lib/udev/ide.sh
         install -m ${SCRIPTMODE) ${DESTDIR}/lib/udev/firmware.sh
-        install -m ${SCRIPTMODE) ${DESTDIR}/lib/udev/input_device.sh
+        install -m ${SCRIPTMODE) ${DESTDIR}/lib/udev/input.sh
         install -m ${SCRIPTMODE) ${DESTDIR}/lib/udev/mount.sh
         install -m ${CONFMODE} ${DESTDIR}/etc/scsi_id.config

udev/boot.udev

@@ -19 +19 @@
 . /etc/sysconfig/rc
 . ${rc_functions}
-
-PATH="/sbin:/bin"
-DAEMON=/sbin/udevd
-udevd_args="--daemon"
 
 function trigger_device_events() {
@@ -58 +54 @@
 case "$1" in
     start)
-
         # disable hotplug helper, udevd listens to netlink
         echo "" > /proc/sys/kernel/hotplug
 
         # start udevd
-        boot_mesg "Starting udevd"
-        loadproc $DAEMON $udevd_args
+        bootmesg "Starting udevd..."
+        loadproc /sbin/udevd --daemon
 
         # cleanup some stuff
+        rm -f /var/run/sysconfig/network
         rm -rf /events/*
+
+        # start coldplugging
+        bootmesg "Performing Coldplugging..."
 
         # unlikely, but we may be faster than the first event
@@ -82 +81 @@
             loop=$(($loop + 1))
         done
+
+        echo_ok
         ;;
 
     stop)
-        boot_mesg "Stopping udevd:"
+        bootmesg "Stopping udevd..."
         echo "/sbin/hotplug" > /proc/sys/kernel/hotplug
-        killproc $DAEMON
+        killproc /sbin/udevd
         ;;
 
     restart)
-        ${0} stop
-        sleep 1
-        ${0} start
+        bootmesg "Restarting udevd..."
+        killproc /sbin/udevd
+        loadproc /sbin/udevd --daemon
+        evaluate_retval
         ;;
 
@@ -101 +103 @@
 
     reload)
-        boot_mesg "Reloading udev rules:"
+        bootmesg "Reloading udev rules..."
         udevcontrol reload_rules
         cp --preserve=all --recursive --update /lib/udev/devices/* /dev
@@ -108 +110 @@
 
     force-reload)
-        boot_mesg "Updating all available device nodes in /dev: "
+        bootmesg "Updating all available device nodes in /dev..."
         udevcontrol reload_rules
         rm -rf /dev/.udev /dev/disk
@@ -115 +117 @@
         evaluate_retval
         ;;
+
     *)
         echo "Usage: $0 {start|stop|restart|status|reload|force-reload}"

udev/boot.udev_retry

@@ -22 +22 @@
 
 case "$1" in
-
     start)
         if test -d /dev/.udev/failed; then
-            boot_mesg "Retry device configuration"
+            bootmesg "Retry device configuration..."
             list=$(echo /dev/.udev/failed/*)
             for i in $list; do

udev/ide.sh

@@ -2 +2 @@
 ########################################################################
 #
-# Description : load_ide_modules
+# Description : Load ide
 #
 # Authors     : Based on Open Suse Udev Rules
@@ -12 +12 @@
 # Version     : 00.00
 #
-# Notes       : 
+# Notes       :
 #
 ########################################################################
 
+# calculate device name from bus and drive number
 device=${DEVPATH#/devices/*/ide?/}
 drive=${device#?.}
 bus=${device%.?}
-name=$(printf "hd%x" $(($drive + $bus * 2 + 10)))
+unitnum=$((96 + 1 + $drive + $bus * 2))
+name=$(printf "hd\\$(printf '%o' $unitnum)")
 procfile="/proc/ide/$name/media"
 
-loop=50
+# wait for /proc file to appear
+loop=30
 while ! test -e $procfile; do
     sleep 0.1;
-    test "$loop" -gt 0 || exit 1
+    test "$loop" -gt 0 || break
     loop=$(($loop - 1))
 done

udev/load_floppy_module.sh

@@ -18 +18 @@
 PROC=/proc/driver/nvram
 
+# wait for /proc file to appear
+loop=10
+while ! test -e $PROC; do
+    sleep 0.1;
+    test "$loop" -gt 0 || break
+    loop=$(($loop - 1))
+done
+
 if [ ! -r /proc/driver/nvram ]; then
     exit 0;

udev/mount.sh

@@ -1 @@
-#! /bin/bash
+#!/bin/sh
+########################################################################
+#
+# Description : Input devices
+#
+# Authors     : Based on Open Suse Udev Rules
+#               kay.sievers@suse.de
+#
+# Adapted to  : Jim Gifford
+# LFS
+#
+# Version     : 00.00
+#
+# Notes       :
+#
+########################################################################
 
-. /etc/sysconfig/hardware/scripts/functions
+. /etc/sysconfig/rc
+. ${rc_functions}
 . /etc/sysconfig/storage
 
@@ -20 +36 @@
         NODES="$NODES /dev/$sl"
 done
-info_mesg "Avilable nodes: $NODES"
+boot_mesg "Avilable nodes: $NODES"
 
 NODE=
@@ -33 +49 @@
                         NODE="$n"
                         FSCK="$fsck"
-                        info_mesg "matching line for $DEVNAME:"
-                        info_mesg "$dn $mp $fs $opts $dump $fsck $x"
+                        boot_mesg "matching line for $DEVNAME:"
+                        boot_mesg "$dn $mp $fs $opts $dump $fsck $x"
                         break 2
                 fi
@@ -43 +59 @@
         MESSAGE="`fsck -a $DEVNAME`"
         RET=$?
-        info_mesg "$MESSAGE"
+        boot_mesg "$MESSAGE"
         case $RET in
                 0|1) : ;;
                 2|3) 
-                        info_mesg "Please unplug device $DEVNAME, and plug it again" 
+                        boot_mesg "Please unplug device $DEVNAME, and plug it again" 
                         logger -t $0 "fsck for '$DEVNAME' failed. Will not mount it."
                         exit 0
@@ -63 +79 @@
         MESSAGE="`mount -av "$NODE"`"
         test $? != 0 && logger -t $0 "Could not mount '$DEVNAME'."
-        info_mesg "$MESSAGE"
+        boot_mesg "$MESSAGE"
 fi