r992 - trunk/udev

jim at linuxfromscratch.org jim at linuxfromscratch.org
Tue Jan 3 12:07:11 PST 2006


Author: jim
Date: 2006-01-03 13:07:10 -0700 (Tue, 03 Jan 2006)
New Revision: 992

Removed:
   trunk/udev/README.Logging
   trunk/udev/remove_floppy_devices.sh
   trunk/udev/scsi_id.config
Modified:
   trunk/udev/
   trunk/udev/05-udev-early.rules
   trunk/udev/50-udev.rules
   trunk/udev/mount.sh
Log:
 r1255 at server:  jim | 2006-01-03 12:06:51 -0800
 Updates from OpenSuse



Property changes on: trunk/udev
___________________________________________________________________
Name: svk:merge
   - 3949c430-d905-0410-97b6-f115d20341b5:/udev:1154
   + 3949c430-d905-0410-97b6-f115d20341b5:/udev:1255

Modified: trunk/udev/05-udev-early.rules
===================================================================
--- trunk/udev/05-udev-early.rules	2006-01-03 17:01:31 UTC (rev 991)
+++ trunk/udev/05-udev-early.rules	2006-01-03 20:07:10 UTC (rev 992)
@@ -17,6 +17,7 @@
 # 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
 #

Modified: trunk/udev/50-udev.rules
===================================================================
--- trunk/udev/50-udev.rules	2006-01-03 17:01:31 UTC (rev 991)
+++ trunk/udev/50-udev.rules	2006-01-03 20:07:10 UTC (rev 992)
@@ -32,7 +32,7 @@
 KERNEL=="hvc*",			NAME="%k", GROUP="uucp"
 KERNEL=="hvsi*",		NAME="%k", GROUP="uucp"
 KERNEL=="iseries/vtty*",	NAME="%k", GROUP="uucp"
-KERNEL=="ttyUSB*", SYSFS{product}=="Palm Handheld*", SYMLINK+="pilot"
+KERNEL=="ttyUSB*", SYSFS{product}=="[Pp]alm*Handheld*", SYMLINK+="pilot"
 
 # video/graphics
 SUBSYSTEM=="video4linux",	GROUP="video"
@@ -49,7 +49,7 @@
 KERNEL=="pmu",			GROUP="video"
 
 # dvb
-SUBSYSTEM=="dvb", PROGRAM="/bin/sh -c 'K=%k; K=$${K#dvb}; printf dvb/adapter%%i/%%i $${K%%%%.*} $${K#*.}'", NAME="%c", GROUP="video"
+SUBSYSTEM=="dvb", PROGRAM="/bin/sh -c 'K=%k; K=$${K#dvb}; printf dvb/adapter%%i/%%s $${K%%%%.*} $${K#*.}'", NAME="%c", GROUP="video"
 
 # input devices
 KERNEL=="mice",			NAME="input/%k", MODE="0640"
@@ -143,9 +143,6 @@
 # device mapper
 KERNEL=="device-mapper", NAME="%k", SYMLINK+="mapper/control"
 
-# check fstab and possibly mount
-SUBSYSTEM=="block", ACTION=="add", KERNEL=="sd*[0-9]|hd*[0-9]", RUN+="mount.sh"
-
 # misc storage devices (non-block)
 KERNEL=="sg*",			NAME="%k", GROUP="disk", MODE="640"
 KERNEL=="st*",			NAME="%k", GROUP="disk"

Deleted: trunk/udev/README.Logging
===================================================================
--- trunk/udev/README.Logging	2006-01-03 17:01:31 UTC (rev 991)
+++ trunk/udev/README.Logging	2006-01-03 20:07:10 UTC (rev 992)
@@ -1,77 +0,0 @@
-How to watch udev activity when booting
-#######################################
-
-
-1) Make syslog start before udev:
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-Since udev writes all output to syslog, we need service syslog running before
-udevd starts. There are two ways to achieve this.
-
-Either add the needed link to /etc/init.d/earlysyslog in /etc/init.d/boot.d/ manually. But it must start later then boot.rootfsck.
-
-Or you edit the service scripts itself and let insserv create the links. You
-have to change earlysyslog and boot.udev:
-  /etc/init.d/earlysyslog
-    Add 'B' to 'Default-Start:' and 'boot.rootfsck' to 'Required-Start:'
-    # Required-Start: boot.rootfsck
-    # Default-Start:  B 2 3 5
-  /etc/init.d/boot.udev
-    Add 'earlysyslog' to 'Required-Start'
-    # Required-Start:    boot.rootfsck earlysyslog
-Then call
-  /sbin/insserv -d earlysyslog
-Check if earlysyslog comes before boot.udev in /etc/init.d/boot.d/S*
-
-You need /var on your root partition for that because boot.localfs is started
-after udev. If you have a seperate /var partition, make it available somehow or
-change the location of your syslog file.
-
-
-2) Enable logging
-^^^^^^^^^^^^^^^^^
-set udev_log=info in /etc/udev/udev.conf. 
-
-There is also debug, but you are very
-probably not interested in the huge amount of debugging output from udev. It
-writes about 70M logfile at a single boot.
-
-Many tools which are called from hotplug also respect the setting of udev_log.
-But there might be some which need special actions to make them verbose.
-[to be enhanced: list tools and their individual debug switches]
-
-You may change udevs loglevel at runtime with
-  udevcontrol log_priority=<level>
-
-
-3) Reboot
-^^^^^^^^^
-For further processing of the logging output you should get a clean logfile at
-next boot. Just move the old logfile away. Syslog will still use the moved file
-until shutdown (until syslog restarted).
-mv /var/log/messages /var/log/messages.`date +%s`
-
-Then reboot.
-
-
-4) Getting logged events sorted
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-There is a script 'show_event_log' which may be used to extract info out of
-/var/log/messages. Call it
-  show_event_log <first> [<last> [<list of event types>] ]
-<first> is the sequence number of the first event you are interested in.
-<last>  is the number of the last event. You may write 'last' literally. It may
-        also be omitted if you want to see a single event. 
-<list>  is a list of event types you like to see. If you omit it, you get most
-        events, not all. Some are exclude by default. Use " " as list if you
-	want to see really all. Or edit the list of skipped events in the first
-        lines of the script
-If you don't use /var/log/messages as lockfile you may set the environment
-variable MESSAGES=<logfile>.
-
-The script is slowly. It is just a quick hack. The larger the syslog file the
-slower the script. Therefore always boot with a fresh logfile.
-Improvements are welcome.
-
-
-Have a lot of fun, as always ;)
-

Modified: trunk/udev/mount.sh
===================================================================
--- trunk/udev/mount.sh	2006-01-03 17:01:31 UTC (rev 991)
+++ trunk/udev/mount.sh	2006-01-03 20:07:10 UTC (rev 992)
@@ -30,7 +30,6 @@
 	*sd[a-z]|*hd[a-z]) exit 0 ;;
 esac
 
-
 NODES=$DEVNAME
 for sl in `udevinfo -q symlink -p $DEVPATH`; do
 	NODES="$NODES /dev/$sl"

Deleted: trunk/udev/remove_floppy_devices.sh
===================================================================
--- trunk/udev/remove_floppy_devices.sh	2006-01-03 17:01:31 UTC (rev 991)
+++ trunk/udev/remove_floppy_devices.sh	2006-01-03 20:07:10 UTC (rev 992)
@@ -1,22 +0,0 @@
-#!/bin/sh
-########################################################################
-#
-# Description : remove_floppy_devices
-#
-# Authors     : Based on Open Suse Udev Rules
-#               kay.sievers at suse.de
-#
-# Adapted to  : Jim Gifford
-# LFS
-#
-# Version     : 00.00
-#
-# Notes       :
-#
-########################################################################
-
-fdname=$1
-
-for dev in /dev/${fdname}*; do
-	rm -f $dev
-done

Deleted: trunk/udev/scsi_id.config
===================================================================
--- trunk/udev/scsi_id.config	2006-01-03 17:01:31 UTC (rev 991)
+++ trunk/udev/scsi_id.config	2006-01-03 20:07:10 UTC (rev 992)
@@ -1,8 +0,0 @@
-#
-# scsi_id configuration
-#
-
-#
-# libata drives require vpd page 0x80
-#
-vendor="ATA",options=-p 0x80




More information about the cross-lfs mailing list