Changeset 26b1cc1

Timestamp:

Feb 21, 2006, 2:31:06 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:

3d85c53

Parents:

52330ef

Message:

r1181@server (orig r1179): jim | 2006-02-14 19:52:37 -0800

r1263@server: jim | 2006-02-14 19:52:14 -0800
Updates from Upstream

Location:

udev

Files:

• 05-udev-early.rules (modified) (1 diff)
• 50-udev.rules (modified) (1 diff)
• 60-persistent-disk.rules (moved) (moved from udev/60-persistent.rules) (1 diff)
• 61-persistent-input.rules (added)
• Makefile (modified) (2 diffs)
• input.sh (deleted)
• show_event_log (modified) (3 diffs)

udev/05-udev-early.rules

@@ -15 +15 @@
 ########################################################################
 
-# sysfs is populated after the event is sent
-#
-ACTION=="add",  DEVPATH=="/devices/*", ENV{PHYSDEVBUS}=="?*", WAIT_FOR_SYSFS="bus"
-ACTION=="add",  SUBSYSTEM=="net", WAIT_FOR_SYSFS="address"
-
 # ignore these events until someone needs them
 #
 SUBSYSTEM=="drivers",           OPTIONS="ignore_device"
 SUBSYSTEM=="module",            OPTIONS="ignore_device"
+
+# sysfs is populated after the event is sent
+#
+ACTION=="add", DEVPATH=="/devices/*", ENV{PHYSDEVBUS}=="?*", WAIT_FOR_SYSFS="bus"
+ACTION=="add", SUBSYSTEM=="scsi", WAIT_FOR_SYSFS="ioerr_cnt"
+ACTION=="add", SUBSYSTEM=="net", WAIT_FOR_SYSFS="address"

udev/50-udev.rules

@@ -61 +61 @@
 KERNEL=="uinput",               NAME="input/%k", MODE="0600"
 KERNEL=="lirc0",                NAME="%k", SYMLINK+="lirc"
-KERNEL=="input[0-9]*",          ACTION=="add", RUN+="input.sh"
 
 # printer

udev/60-persistent-disk.rules

@@ -1 +1 @@
 ########################################################################
 #
-# Description : 60-persistent.rules
+# Description : 60-persistent-disk.rules
 #
 # Authors     : Based on Open Suse Udev Rules

udev/Makefile

@@ -18 +18 @@
         install -m ${RULESMODE} 50-udev.rules ${DESTDIR}/etc/udev/rules.d/50-udev.rules
         install -m ${RULESMODE} 55-sound.rules ${DESTDIR}/etc/udev/rules.d/55-sound.rules
-        install -m ${RULESMODE} 60-persistent.rules ${DESTDIR}/etc/udev/rules.d/60-persistent.rules
+        install -m ${RULESMODE} 60-persistent-disk.rules ${DESTDIR}/etc/udev/rules.d/60-persistent-disk.rules
+        install -m ${RULESMODE} 61-persistent-input.rules ${DESTDIR}/etc/udev/rules.d/60-persistent-input.rules
         install -m ${RULESMODE} 90-user.rules ${DESTDIR}/etc/udev/rules.d/90-user.rules
         install -m ${RULESMODE} 95-debug.rules ${DESTDIR}/etc/udev/rules.d/95-debug.rules
@@ -30 +31 @@
         install -m ${SCRIPTMODE} load_floppy_module.sh ${DESTDIR}/lib/udev/load_floppy_module.sh
         install -m ${SCRIPTMODE} check-cdrom.sh ${DESTDIR}/lib/udev/check-cdrom.sh
-        install -m ${SCRIPTMODE} input.sh ${DESTDIR}/lib/udev/input.sh
 
 boot:

udev/show_event_log

@@ -16 +16 @@
 ########################################################################
 #
+# extract udev log messages from a syslog file
+# show_event_log <first> [<last> [<list of event types>] ]
+#
 # known events are:
-# ac97 acpi block cpu drivers edd firmware graphics i2c-adapter i8259
-# ieee1394_protocol input ioapic irqrouter lapic mem misc module namespace
-# pci_bus pci_express pcmcia pcmcia_socket platform pnp printer scsi scsi_host
-# serio sound timer timer_pit tty usb usb_device usb_host vc
+#   ac97 acpi block cpu drivers edd firmware graphics i2c-adapter i8259
+#   ieee1394_protocol input ioapic irqrouter lapic mem misc module namespace
+#   pci_bus pci_express pcmcia pcmcia_socket platform pnp printer scsi scsi_host
+#   serio sound timer timer_pit tty usb usb_device usb_host vc
 #
+# GPL, version 2
+# Christian Zoz <zoz@suse.de>
+#
+
 EXCLUDE_SUBS="acpi cpu edd mem namespace pci_bus tty vc"
-# EXCLUDE_SUBS="ac97 acpi cpu drivers edd graphics i2c-adapter mem i8259 ioapic irqrouter lapic mem module namespace platform pnp pci_bus tty vc"
 MESSAGES=${MESSAGES:-/var/log/messages}
-#grep udevd /var/log/messages | grep -v "pass_env\|geventrec\|hal.hot\|received"
 
 show_event() {
         local SN PID SUBS
         declare -i SN=$1 PID
-#       read PID ACT SUBS < <(sed -n "s/^.*seq $SN forked, pid \[\([0-9]*\)\], \([^,]*\),.*$/\1 \2/p;T;q" $MESSAGES)
         read PID ACT SUBS < <(sed -n "s/^.*seq $SN forked, pid \[\([0-9]*\)\], '\([^']*\)' '\([^']*\)'.*$/\1 \2 \3/p;T;q" $MESSAGES)
         if [ $PID == 0 ] ; then
@@ -57 +61 @@
 declare -i START=$1 STOP=$2
 if [ "$2" == last ] ; then
-        read STOP < <(grep -o "udev_done.*exit" $MESSAGES | cut -d" " -f3 | sort -n | tail -1)
+        read STOP_STRING < <(grep -o "udev_done.*exit" $MESSAGES | cut -d" " -f3 | sort -n | tail -1)
+        STOP=`echo $STOP_STRING | sed 's/^[^0-9]*\([0-9]\+\).*$/\1/'`
 fi
 test $START -lt 0 -a $STOP -gt 0 && START=$((STOP+START+1))
@@ -65 +70 @@
         show_event $n
 done
-        
+
 exit