diff -rN -u old-frugalware-current/source/base/udev/blacklist new-frugalware-current/source/base/udev/blacklist --- old-frugalware-current/source/base/udev/blacklist 2007-03-12 10:42:12.000000000 +0100 +++ new-frugalware-current/source/base/udev/blacklist 1970-01-01 01:00:00.000000000 +0100 @@ -1,11 +0,0 @@ -# -# Listing a module here prevents the hotplug scripts from loading it. -# Usually that'd be so that some other driver will bind it instead, -# no matter which driver happens to get probed first. Sometimes user -# mode tools can also control driver binding. -# -# Syntax: driver name alone (without any spaces) on a line. Other -# lines are ignored. -# - -seclvl diff -rN -u old-frugalware-current/source/base/udev/FrugalBuild new-frugalware-current/source/base/udev/FrugalBuild --- old-frugalware-current/source/base/udev/FrugalBuild 2007-03-12 10:42:12.000000000 +0100 +++ new-frugalware-current/source/base/udev/FrugalBuild 2007-03-12 10:43:59.000000000 +0100 @@ -3,22 +3,17 @@ pkgname=udev pkgver=106 -pkgrel=1 +pkgrel=2 pkgdesc="A userspace implementation of devfs" url="http://www.kernel.org/pub/linux/utils/kernel/hotplug/" -backup=(etc/udev/{udev.conf,rules.d/50-udev-default.rules,cdsymlinks.conf} \ - etc/sysconfig/blacklist) +backup=(etc/udev/{udev.conf,rules.d/50-udev-default.rules,cdsymlinks.conf}) depends=('glibc') rodepends=('chkconfig' 'coreutils' 'grep') groups=('base' 'core') archs=('i686' 'x86_64' 'ppc') -conflicts=('devfsd' 'pcmcia-cs' 'hotplug') -replaces=('hotplug') up2date="lynx -dump '$url?C=M;O=D'|grep 'udev-.*tar.bz2 '|sed -n 's/.*-\(.*\)\.t.*/\1/;1 p'" -source=($url/$pkgname-$pkgver.tar.gz rc.udev blacklist \ - rc.hotplug rc.hotplug-hu.po \ - README.Frugalware) -signatures=("${source[0]}.sign" '' '' '' '' '') +source=($url/$pkgname-$pkgver.tar.gz rc.udev README.Frugalware) +signatures=("${source[0]}.sign" '' '') # if you update this package, you MUST test it carefully, # including the rules. run 'udevtest -h' for the later @@ -32,13 +27,10 @@ Fpatchall make || return 1 Fmakeinstall EXTRAS="extras/ata_id extras/cdrom_id extras/path_id extras/dasd_id extras/edd_id extras/firmware extras/floppy extras/run_directory extras/scsi_id extras/usb_id extras/volume_id extras/rule_generator" - Fexerel /sbin/udevstart Fmkdir /lib/udev/devices Ffilerel etc/udev/frugalware/* /etc/udev/rules.d/ Ffilerel etc/udev/rules.d/* /etc/udev/rules.d/ Fexe /etc/rc.d/rc.udev - Frcd2 hotplug - Ffile /etc/sysconfig/blacklist Fdoc README.Frugalware mknod -m 700 $Fdestdir/dev/console c 5 1 mknod -m 666 $Fdestdir/dev/null c 1 3 diff -rN -u old-frugalware-current/source/base/udev/rc.hotplug new-frugalware-current/source/base/udev/rc.hotplug --- old-frugalware-current/source/base/udev/rc.hotplug 2007-03-12 10:42:12.000000000 +0100 +++ new-frugalware-current/source/base/udev/rc.hotplug 1970-01-01 01:00:00.000000000 +0100 @@ -1,48 +0,0 @@ -#!/bin/bash - -# (c) 2003-2006 Miklos Vajna -# (c) 2005 Marcus Habermehl -# rc.hotplug for Frugalware -# distributed under GPL License - -# chkconfig: 2345 06 99 -# description: Automatic hardware detection - -source /lib/initscripts/functions -TEXTDOMAIN=hotplug -TEXTDOMAINDIR=/lib/initscripts/messages - -actions=(start stop) - -rc_start() -{ - msg $"Activating hardware detection" - for i in `find /sys/devices/ -name modalias |grep pci` - do - modlist="$modlist $(modprobe --show-depends `cat $i` 2>/dev/null|sed 's|insmod [^ ]*/\([^ ]*\)\.ko|\1|g')" - done - if [ -e /etc/sysconfig/blacklist ]; then - for i in `cat /etc/sysconfig/blacklist|sed 's/#.*$//'`; - do - blacklist="$blacklist s/$i//;" - done - modlist=`echo "$modlist"|sed "$blacklist"` - fi - echo "0" > /proc/sys/kernel/printk - for i in `echo $modlist|sed 's/ /\n/g'|sort -u` - do - modprobe $i >/dev/null 2>&1 - done - # closes #281 - sleep 1 - ok $? -} - -rc_stop() -{ - /bin/true -} - -rc_exec $1 - -# vim: ft=sh diff -rN -u old-frugalware-current/source/base/udev/rc.hotplug-hu.po new-frugalware-current/source/base/udev/rc.hotplug-hu.po --- old-frugalware-current/source/base/udev/rc.hotplug-hu.po 2007-03-12 10:42:12.000000000 +0100 +++ new-frugalware-current/source/base/udev/rc.hotplug-hu.po 1970-01-01 01:00:00.000000000 +0100 @@ -1,24 +0,0 @@ -# Hungarian translations for rc.hotplug package. -# Copyright (C) 2006 THE rc.hotplug'S COPYRIGHT HOLDER -# This file is distributed under the same license as the rc.hotplug package. -# , 2006. -# -msgid "" -msgstr "" -"Project-Id-Version: rc.hotplug\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-01-05 12:37+0100\n" -"PO-Revision-Date: 2006-01-05 12:28+0100\n" -"Last-Translator: \n" -"Language-Team: Hungarian \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=ISO-8859-2\n" -"Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=1; plural=0;\n" - -#: rc.hotplug:25 -msgid "Activating hardware detection" -msgstr "Az automatikus hardverfelismerés indítása" - -#~ msgid "Stopping hotpluggable subsystem" -#~ msgstr "A hotplug alrendszer leállítása" diff -rN -u old-frugalware-current/source/base/udev/rc.hotplug.pot new-frugalware-current/source/base/udev/rc.hotplug.pot --- old-frugalware-current/source/base/udev/rc.hotplug.pot 2007-03-12 10:42:12.000000000 +0100 +++ new-frugalware-current/source/base/udev/rc.hotplug.pot 1970-01-01 01:00:00.000000000 +0100 @@ -1,21 +0,0 @@ -# SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the PACKAGE package. -# FIRST AUTHOR , YEAR. -# -#, fuzzy -msgid "" -msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-01-05 12:37+0100\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME \n" -"Language-Team: LANGUAGE \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=CHARSET\n" -"Content-Transfer-Encoding: 8bit\n" - -#: rc.hotplug:25 -msgid "Activating hardware detection" -msgstr "" diff -rN -u old-frugalware-current/source/base/udev/rc.udev new-frugalware-current/source/base/udev/rc.udev --- old-frugalware-current/source/base/udev/rc.udev 2007-03-12 10:42:12.000000000 +0100 +++ new-frugalware-current/source/base/udev/rc.udev 2007-03-12 10:43:59.000000000 +0100 @@ -1,96 +1,36 @@ #!/bin/bash -# (c) 2004 Vajna Miklos -# rc.udev for Frugalware -# version 0.9.1 -# distributed under GPL license -# # Copyright (C) 2004 Greg Kroah-Hartman +# Copyright (C) 2004 Miklos Vajna +# Copyright (C) 2007 Gabriel Craciunescu + +# rc.udev for Frugalware # Released under the GPL v2 only. -# -# Thanks go out to the Gentoo developers for proving -# that this is possible to do. mount / -o rw,remount mount none -t sysfs /sys -. /etc/udev/udev.conf - -prog=udev -sysfs_dir=/sys -bin=/sbin/udev -udevd=/sbin/udevd -udev_root="/dev" - -run_udev () { - # handle block devices and their partitions - for i in ${sysfs_dir}/block/*; do - # add each drive - export DEVPATH=${i#${sysfs_dir}} - #echo "$DEVPATH" - $bin block - - # add each partition, on each device - for j in $i/*; do - if [ -f $j/dev ]; then - export DEVPATH=${j#${sysfs_dir}} - #echo "$DEVPATH" - $bin block - fi - done - done - # all other device classes - for i in ${sysfs_dir}/class/*; do - for j in $i/*; do - if [ -f $j/dev ]; then - export DEVPATH=${j#${sysfs_dir}} - CLASS=`echo ${i#${sysfs_dir}} | \ - cut --delimiter='/' --fields=3-` - #echo "$DEVPATH" - $bin $CLASS - fi - done - done - return 0 -} - -make_extra_nodes () { - # there are a few things that sysfs does not export for us. - # these things go here (and remember to remove them in - # remove_extra_nodes() - # - # Thanks to Gentoo for the initial list of these. - ln -snf /proc/self/fd $udev_root/fd - ln -snf /proc/self/fd/0 $udev_root/stdin - ln -snf /proc/self/fd/1 $udev_root/stdout - ln -snf /proc/self/fd/2 $udev_root/stderr - ln -snf /proc/kcore $udev_root/core - - mkdir $udev_root/pts - mkdir $udev_root/shm -} +if [ -f /etc/udev/udev.conf ]; then + . /etc/udev/udev.conf +fi # don't use udev if sysfs is not mounted. -if [ ! -d $sysfs_dir/block ]; then +if [ ! -d /sys/block ]; then exit 1 fi -#echo "mounting... ramfs at $udev_root" -mount -n -t ramfs none $udev_root +#echo "mounting... ramfs at /dev" +mount -n -t ramfs none /dev -# propogate /udev from /sys -export ACTION=add -export UDEV_NO_SLEEP=1 -#echo "Creating initial udev device nodes:" - -# You can use the shell scripts above by calling run_udev or execute udevstart -# which does the same thing, but much faster by not using shell. -# Only comment out one of the following lines. -#run_udev -/sbin/udevstart - -#echo "making extra nodes" -make_extra_nodes +# there are a few things that sysfs does not export for us. +# these things go here +ln -snf /proc/self/fd /dev/fd +ln -snf /proc/self/fd/0 /dev/stdin +ln -snf /proc/self/fd/1 /dev/stdout +ln -snf /proc/self/fd/2 /dev/stderr +ln -snf /proc/kcore /dev/core +mkdir /dev/pts +mkdir /dev/shm #echo "udev startup is finished!" @@ -103,13 +43,16 @@ /sbin/udevd --daemon fi -# Make udevsend the hotplug multiplexer if [ -f "/sys/class/tty/console/uevent" ]; then # trigger the sorted events echo -e '\000\000\000\000' > /proc/sys/kernel/hotplug -else - echo "/sbin/udevsend" > /proc/sys/kernel/hotplug -fi +fi + +mkdir -p /dev/.udev/queue +/sbin/udevtrigger +# Wait for udev events +/sbin/udevsettle + mount / -o ro,remount # end of rc.udev diff -rN -u old-frugalware-current/source/base/udev/README.Frugalware new-frugalware-current/source/base/udev/README.Frugalware --- old-frugalware-current/source/base/udev/README.Frugalware 2007-03-12 10:42:12.000000000 +0100 +++ new-frugalware-current/source/base/udev/README.Frugalware 2007-03-12 10:43:59.000000000 +0100 @@ -1,4 +1,2 @@ -/lib/udev/devices is the directory where packages or you can place real -device nodes, which get copied over to /dev at every boot. This replaces -our previous /etc/sysconfig/udev solution. (The change was recommended by -upstream.) +`/lib/udev/devices` is the directory where packages or you can place real +device nodes, which get copied over to /dev at every boot. diff -rN -u old-frugalware-current/source/base/udev/udev.install new-frugalware-current/source/base/udev/udev.install --- old-frugalware-current/source/base/udev/udev.install 2007-03-12 10:42:12.000000000 +0100 +++ new-frugalware-current/source/base/udev/udev.install 2007-03-12 10:43:59.000000000 +0100 @@ -2,35 +2,11 @@ { cd /etc/rc.d/rcS.d ln -sf ../rc.udev S00rc.udev - chkconfig --add rc.hotplug -} - -post_upgrade() -{ - # force once the usage of hotplug - if [ `vercmp $2 079` -lt 0 ] ; then - chkconfig --add rc.hotplug - fi - if [ -e /etc/sysconfig/udev ]; then - echo "warning: /etc/sysconfig/udev is now obsolete, please read" - echo "/usr/share/doc/udev-`echo $1|sed 's/\(.*\)-.*/\1/'`/README.Frugalware!" - mv /etc/sysconfig/udev /etc/sysconfig/udev.pacsave - fi - # if the usbfs line is missing then add it - if [ -e /etc/fstab ] && ! grep -q usbfs /etc/fstab; then - printf "%-16s %-16s %-11s %-16s %-3s %s\n" "usbfs" "/proc/bus/usb" "usbfs" "devgid=23,devmode=664" "0" "0" \ - >>/etc/fstab - fi - # if it's there then just update it - [ -e /etc/fstab ] && sed -i 's/\(usbfs *\)defaults/\1devgid=23,devmode=664/' /etc/fstab - - getent group storage >/dev/null || /usr/sbin/groupadd -g 30 storage } pre_remove() { rm /etc/rc.d/rcS.d/S00rc.udev - chkconfig --del rc.hotplug } op=$1