Changeset a6cd72e for udev


Ignore:
Timestamp:
Feb 21, 2006, 1:37:37 AM (19 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:
3 added
2 deleted
6 edited
1 moved

Legend:

Unmodified
Added
Removed

  • udev/50-udev.rules

    rce36880 ra6cd72e  
    1414#
    1515########################################################################
    16 
    17 # ignore these events until someone needs them
    18 SUBSYSTEM=="drivers",           OPTIONS="last_rule"
    19 SUBSYSTEM=="module",            OPTIONS="last_rule"
    2016
    2117# console
    … …  
    5652SUBSYSTEM=="dvb", PROGRAM="/bin/sh -c 'K=%k; K=$${K#dvb}; printf dvb/adapter%%i/%%i $${K%%%%.*} $${K#*.}'", NAME="%c", GROUP="video"
    5753
    58 # Kino jogshuttle support
    59 SUBSYSTEM=="usb", ACTION=="add", ENV{PRODUCT}=="b33/10/*", RUN+="/usr/bin/killall --quiet -USR2 kino"
    60 SUBSYSTEM=="usb", ACTION=="add", ENV{PRODUCT}=="5f3/240/*", RUN+="/usr/bin/killall --quiet -USR2 kino"
    61 
    6254# input devices
    6355KERNEL=="mice",                 NAME="input/%k", MODE="0640"
    … …  
    6860KERNEL=="uinput",               NAME="input/%k", MODE="0600"
    6961KERNEL=="lirc0",                NAME="%k", SYMLINK+="lirc"
    70 KERNEL=="input[0-9]*",          RUN+="/lib/udev/input_device.sh"
    71 KERNEL=="input[0-9]*",          ACTION=="add", ENV{ABS}=="[1-9]*", RUN+="/sbin/modprobe joydev"
     62KERNEL=="input[0-9]*", ACTION=="add", RUN+="input.sh"
    7263
    7364# printer
    … …  
    9485# 167 /dev/specialix_sxctl Specialix serial control
    9586KERNEL=="sxctl",                NAME="specialix_sxctl", SYMLINK+="%k"
     87
     88# network
     89KERNEL=="tun", NAME="net/%k", MODE="0600"
    9690
    9791# misc devices
    … …  
    121115KERNEL=="auer[0-9]*"            NAME="usb/%k"
    122116
     117# packet writing interface
    123118KERNEL=="pktcdvd",              NAME="pktcdvd/control"
    124119KERNEL=="pktcdvd[0-9]*",        NAME="pktcdvd/%k"
    125120
    126121# fix floppy devices
    127 KERNEL=="nvram", ACTION=="add", RUN+="/lib/udev/load_floppy_module.sh"
    128 KERNEL=="fd*", ACTION=="add", SYSFS{device/cmos}=="*", RUN+="/lib/udev/create_floppy_devices -c -t $sysfs{device/cmos} -m %M /dev/%k"
    129 KERNEL=="fd*", ACTION=="remove", RUN+="/lib/udev/remove_floppy_devices.sh %k"
     122KERNEL=="nvram", ACTION=="add", RUN+="load_floppy_module.sh"
     123KERNEL=="fd[0-9]*", ACTION=="add", SYSFS{device/cmos}=="*", RUN+="create_floppy_devices -c -t $sysfs{device/cmos} -m %M /dev/%k"
     124KERNEL=="fd[0-9]*", ACTION=="remove", RUN+="/bin/rm -f $root/%k*"
    130125
    131126# block devices
    … …  
    143138SUBSYSTEM=="scsi_device", ACTION=="add", RUN+="/sbin/modprobe sg"
    144139
    145 # IDE modules
    146 SUBSYSTEM=="ide", ACTION=="add", RUN+="/lib/udev/load_ide_modules.sh"
     140# load IDE modules
     141SUBSYSTEM=="ide", ACTION=="add", RUN+="ide.sh"
    147142
    148143# device mapper
    149 KERNEL=="device-mapper", ACTION=="add", NAME="%k", SYMLINK+="mapper/control"
     144KERNEL=="device-mapper", NAME="%k", SYMLINK+="mapper/control"
    150145
    151146# check fstab and possibly mount
    152 SUBSYSTEM=="block", KERNEL=="sd*[0-9]|hd*[0-9]", ACTION=="add", RUN+="/lib/udev/mount.sh"
     147SUBSYSTEM=="block", ACTION=="add", KERNEL=="sd*[0-9]|hd*[0-9]", RUN+="mount.sh"
    153148
    154149# misc storage devices (non-block)
    … …  
    179174SUBSYSTEM=="usb_device", PROGRAM="/bin/sh -c 'K=%k; K=$${K#usbdev}; printf bus/usb/%%03i/%%03i $${K%%%%.*} $${K#*.}'", NAME="%c", MODE="0644"
    180175
    181 # firmware loader
    182 SUBSYSTEM=="firmware", ACTION=="add", RUN+="/lib/udev/firmware.sh"
     176# kernel firmware loader
     177SUBSYSTEM=="firmware", ACTION=="add", RUN+="firmware.sh"

  • udev/Makefile

    rce36880 ra6cd72e  
    1010
    1111rules:
    12         install -m ${RULESMODE} ${DESTDIR}/etc/udev/rules.d/10-wait-for-sysfs.rules
     12        install -m ${RULESMODE} ${DESTDIR}/etc/udev/rules.d/05-udev-early.rules
    1313        install -m ${RULESMODE} ${DESTDIR}/etc/udev/rules.d/50-udev.rules
    1414        install -m ${RULESMODE} ${DESTDIR}/etc/udev/rules.d/60-persistent.rules
    … …  
    1919        install -m ${SCRIPTMODE) ${DESTDIR}/lib/udev/remove_floppy_devices.sh
    2020        install -m ${SCRIPTMODE) ${DESTDIR}/lib/udev/load_floppy_module.sh
    21         install -m ${SCRIPTMODE) ${DESTDIR}/lib/udev/load_ide_modules.sh
     21        install -m ${SCRIPTMODE) ${DESTDIR}/lib/udev/ide.sh
    2222        install -m ${SCRIPTMODE) ${DESTDIR}/lib/udev/firmware.sh
    23         install -m ${SCRIPTMODE) ${DESTDIR}/lib/udev/input_device.sh
     23        install -m ${SCRIPTMODE) ${DESTDIR}/lib/udev/input.sh
    2424        install -m ${SCRIPTMODE) ${DESTDIR}/lib/udev/mount.sh
    2525        install -m ${CONFMODE} ${DESTDIR}/etc/scsi_id.config

  • udev/boot.udev

    rce36880 ra6cd72e  
    1919. /etc/sysconfig/rc
    2020. ${rc_functions}
    21 
    22 PATH="/sbin:/bin"
    23 DAEMON=/sbin/udevd
    24 udevd_args="--daemon"
    2521
    2622function trigger_device_events() {
    … …  
    5854case "$1" in
    5955    start)
    60 
    6156        # disable hotplug helper, udevd listens to netlink
    6257        echo "" > /proc/sys/kernel/hotplug
    6358
    6459        # start udevd
    65         boot_mesg "Starting udevd"
    66         loadproc $DAEMON $udevd_args
     60        bootmesg "Starting udevd..."
     61        loadproc /sbin/udevd --daemon
    6762
    6863        # cleanup some stuff
     64        rm -f /var/run/sysconfig/network
    6965        rm -rf /events/*
     66
     67        # start coldplugging
     68        bootmesg "Performing Coldplugging..."
    7069
    7170        # unlikely, but we may be faster than the first event
    … …  
    8281            loop=$(($loop + 1))
    8382        done
     83
     84        echo_ok
    8485        ;;
    8586
    8687    stop)
    87         boot_mesg "Stopping udevd:"
     88        bootmesg "Stopping udevd..."
    8889        echo "/sbin/hotplug" > /proc/sys/kernel/hotplug
    89         killproc $DAEMON
     90        killproc /sbin/udevd
    9091        ;;
    9192
    9293    restart)
    93         ${0} stop
    94         sleep 1
    95         ${0} start
     94        bootmesg "Restarting udevd..."
     95        killproc /sbin/udevd
     96        loadproc /sbin/udevd --daemon
     97        evaluate_retval
    9698        ;;
    9799
    … …  
    101103
    102104    reload)
    103         boot_mesg "Reloading udev rules:"
     105        bootmesg "Reloading udev rules..."
    104106        udevcontrol reload_rules
    105107        cp --preserve=all --recursive --update /lib/udev/devices/* /dev
    … …  
    108110
    109111    force-reload)
    110         boot_mesg "Updating all available device nodes in /dev: "
     112        bootmesg "Updating all available device nodes in /dev..."
    111113        udevcontrol reload_rules
    112114        rm -rf /dev/.udev /dev/disk
    … …  
    115117        evaluate_retval
    116118        ;;
     119
    117120    *)
    118121        echo "Usage: $0 {start|stop|restart|status|reload|force-reload}"

  • udev/boot.udev_retry

    rce36880 ra6cd72e  
    2222
    2323case "$1" in
    24 
    2524    start)
    2625        if test -d /dev/.udev/failed; then
    27             boot_mesg "Retry device configuration"
     26            bootmesg "Retry device configuration..."
    2827            list=$(echo /dev/.udev/failed/*)
    2928            for i in $list; do

  • udev/ide.sh

    • Property mode changed from 100644 to 100755
    rce36880 ra6cd72e  
    22########################################################################
    33#
    4 # Description : load_ide_modules
     4# Description : Load ide
    55#
    66# Authors     : Based on Open Suse Udev Rules
    … …  
    1212# Version     : 00.00
    1313#
    14 # Notes       : 
     14# Notes       :
    1515#
    1616########################################################################
    1717
     18# calculate device name from bus and drive number
    1819device=${DEVPATH#/devices/*/ide?/}
    1920drive=${device#?.}
    2021bus=${device%.?}
    21 name=$(printf "hd%x" $(($drive + $bus * 2 + 10)))
     22unitnum=$((96 + 1 + $drive + $bus * 2))
     23name=$(printf "hd\\$(printf '%o' $unitnum)")
    2224procfile="/proc/ide/$name/media"
    2325
    24 loop=50
     26# wait for /proc file to appear
     27loop=30
    2528while ! test -e $procfile; do
    2629    sleep 0.1;
    27     test "$loop" -gt 0 || exit 1
     30    test "$loop" -gt 0 || break
    2831    loop=$(($loop - 1))
    2932done

  • udev/load_floppy_module.sh

    rce36880 ra6cd72e  
    1818PROC=/proc/driver/nvram
    1919
     20# wait for /proc file to appear
     21loop=10
     22while ! test -e $PROC; do
     23    sleep 0.1;
     24    test "$loop" -gt 0 || break
     25    loop=$(($loop - 1))
     26done
     27
    2028if [ ! -r /proc/driver/nvram ]; then
    2129    exit 0;

  • udev/mount.sh

    rce36880 ra6cd72e  
    1 #! /bin/bash
     1#!/bin/sh
     2########################################################################
     3#
     4# Description : Input devices
     5#
     6# Authors     : Based on Open Suse Udev Rules
     7#               kay.sievers@suse.de
     8#
     9# Adapted to  : Jim Gifford
     10# LFS
     11#
     12# Version     : 00.00
     13#
     14# Notes       :
     15#
     16########################################################################
    217
    3 . /etc/sysconfig/hardware/scripts/functions
     18. /etc/sysconfig/rc
     19. ${rc_functions}
    420. /etc/sysconfig/storage
    521
    … …  
    2036        NODES="$NODES /dev/$sl"
    2137done
    22 info_mesg "Avilable nodes: $NODES"
     38boot_mesg "Avilable nodes: $NODES"
    2339
    2440NODE=
    … …  
    3349                        NODE="$n"
    3450                        FSCK="$fsck"
    35                         info_mesg "matching line for $DEVNAME:"
    36                         info_mesg "$dn $mp $fs $opts $dump $fsck $x"
     51                        boot_mesg "matching line for $DEVNAME:"
     52                        boot_mesg "$dn $mp $fs $opts $dump $fsck $x"
    3753                        break 2
    3854                fi
    … …  
    4359        MESSAGE="`fsck -a $DEVNAME`"
    4460        RET=$?
    45         info_mesg "$MESSAGE"
     61        boot_mesg "$MESSAGE"
    4662        case $RET in
    4763                0|1) : ;;
    4864                2|3)
    49                         info_mesg "Please unplug device $DEVNAME, and plug it again"
     65                        boot_mesg "Please unplug device $DEVNAME, and plug it again"
    5066                        logger -t $0 "fsck for '$DEVNAME' failed. Will not mount it."
    5167                        exit 0
    … …  
    6379        MESSAGE="`mount -av "$NODE"`"
    6480        test $? != 0 && logger -t $0 "Could not mount '$DEVNAME'."
    65         info_mesg "$MESSAGE"
     81        boot_mesg "$MESSAGE"
    6682fi
Note: See TracChangeset for help on using the changeset viewer.