[arch-commits] CVS update of core/base/udev (4 files)
Aaron Griffin
aaron at archlinux.org
Thu Mar 6 06:45:23 UTC 2008
Date: Thursday, March 6, 2008 @ 01:45:23
Author: aaron
Path: /home/cvs-core/core/base/udev
Modified: PKGBUILD (1.153 -> 1.154) load-modules.sh (1.10 -> 1.11)
udev.rules (1.93 -> 1.94)
Removed: 00-load-blacklist.rules (1.1)
Reverting back to the older way of doing things, with minor improvements
where they can be made
-------------------------+
00-load-blacklist.rules | 1 -
PKGBUILD | 11 +++++------
load-modules.sh | 42 +++++++++++++++++++++++++++++++++++-------
udev.rules | 3 +++
4 files changed, 43 insertions(+), 14 deletions(-)
Index: core/base/udev/00-load-blacklist.rules
diff -u core/base/udev/00-load-blacklist.rules:1.1 core/base/udev/00-load-blacklist.rules:removed
--- core/base/udev/00-load-blacklist.rules:1.1 Thu Feb 21 01:29:54 2008
+++ core/base/udev/00-load-blacklist.rules Thu Mar 6 01:45:23 2008
@@ -1 +0,0 @@
-IMPORT{program} = "/lib/udev/mod-blacklist.sh"
Index: core/base/udev/PKGBUILD
diff -u core/base/udev/PKGBUILD:1.153 core/base/udev/PKGBUILD:1.154
--- core/base/udev/PKGBUILD:1.153 Thu Feb 21 01:29:54 2008
+++ core/base/udev/PKGBUILD Thu Mar 6 01:45:22 2008
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD,v 1.153 2008/02/21 06:29:54 aaron Exp $
+# $Id: PKGBUILD,v 1.154 2008/03/06 06:45:22 aaron Exp $
# Maintainer: ???
pkgname=udev
pkgver=118
-pkgrel=2
+pkgrel=3
pkgdesc="The userspace dev tools (udev)"
arch=(i686 x86_64)
url="http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html"
@@ -18,7 +18,7 @@
replaces=('devfsd')
options=(!makeflags)
source=(http://www.kernel.org/pub/linux/utils/kernel/hotplug/$pkgname-$pkgver.tar.bz2
- migrate-udev udev.rules 00-load-blacklist.rules load-modules.sh mod-blacklist.sh
+ migrate-udev start_udev udev.rules load-modules.sh
cdrom-rules.patch cdsymlinks.sh root-link.sh readme-udev-arch.txt)
md5sums=('39ab2404464c7026c65eb878827192b9'
'49434a593918c822077bc3af765f1aff'
@@ -39,12 +39,11 @@
# remove udev default files
rm -f $startdir/pkg/etc/udev/rules.d/{05-udev-early.rules,50-udev-default.rules,60-persistent-storage.rules,61-persistent-storage-edd.rules,60-persistent-input.rules,80-drivers.rules,95-udev-late.rules}
install -D -m755 extras/path_id/path_id $startdir/pkg/sbin/path_id
+ install -D -m755 $startdir/src/start_dev $startdir/pkg/etc/start_udev
install -D -m755 $startdir/src/migrate-udev $startdir/pkg/sbin/migrate-udev
install -D -m644 $startdir/src/udev.rules $startdir/pkg/etc/udev/rules.d/udev.rules
- # install out module loadintg subsystem
+ # install out module loading subsystem
install -D -m755 $startdir/src/load-modules.sh $startdir/pkg/lib/udev/load-modules.sh
- install -D -m755 $startdir/src/mod-blacklist.sh $startdir/pkg/lib/udev/mod-blacklist.sh
- install -D -m644 $startdir/src/00-load-blacklist.rules $startdir/pkg/etc/udev/rules.d/00-load-blacklist.rules
# install cdsymlinks.sh
install -D -m755 $startdir/src/cdsymlinks.sh $startdir/pkg/lib/udev/cdsymlinks.sh
# install root-link.sh
Index: core/base/udev/load-modules.sh
diff -u core/base/udev/load-modules.sh:1.10 core/base/udev/load-modules.sh:1.11
--- core/base/udev/load-modules.sh:1.10 Thu Feb 21 01:29:54 2008
+++ core/base/udev/load-modules.sh Thu Mar 6 01:45:22 2008
@@ -1,10 +1,38 @@
-#! /bin/sh
+#! /bin/bash
# Implement blacklisting for udev-loaded modules
[ $# -ne 1 ] && exit 1
+. /etc/rc.conf
+
+# grab modules from rc.conf
+BLACKLIST="${MOD_BLACKLIST[@]}"
+
+if [ -f /proc/cmdline ]; then
+ for cmd in $(cat /proc/cmdline); do
+ case $cmd in
+ *=*) eval $cmd ;;
+ esac
+ done
+ #parse cmdline entries of the form "disablemodules=x,y,z"
+ if [ -n "$disablemodules" ]; then
+ BLACKLIST="$BLACKLIST $(echo $disablemodules | sed 's|,| |g')"
+ fi
+ if [ "$load_modules" == "off" ]; then
+ MOD_AUTOLOAD="no"
+ fi
+fi
+
+#MODULES entries in rc.conf that begin with ! are blacklisted
+for mod in ${MODULES[@]}; do
+ if [ "${mod}" != "${mod#!}" ]; then
+ BLACKLIST="$BLACKLIST ${mod#!}"
+ fi
+done
+
+
if [ "$MOD_AUTOLOAD" = "yes" -o "$MOD_AUTOLOAD" = "YES" ]; then
- if [ -n "$BLACKLIST" ]; then
+ if [ -n "$BLACKLIST" ]; then
depmods="$(/sbin/modprobe -i --show-depends $1)"
if [ $? -ne 0 ]; then
/usr/bin/logger -p info "cannot find module $1"
@@ -12,9 +40,9 @@
fi
#sanitize our module names
- depmods="$(echo $depmods \
- | sed "s#^insmod /lib.*/\(.*\)\.ko.*#\1#g" \
- | sed 's|-|_|g')"
+ depmods="$(echo $depmods | sed \
+ -e "s#^insmod /lib.*/\(.*\)\.ko.*#\1#g" \
+ -e 's|-|_|g')"
for mod in $depmods; do
if echo $BLACKLIST | /bin/grep "\<$mod\>" 2>&1 >/dev/null; then
@@ -22,11 +50,11 @@
exit 1
fi
done
- fi
+ fi
/sbin/modprobe $1
else
#/usr/bin/logger -p info \
echo \
- "udev load-modules: autoloading is disabled, not loading $1"
+ "udev load-modules: autoloading is disabled, not loading $1"
fi
# vim: set et ts=4:
Index: core/base/udev/udev.rules
diff -u core/base/udev/udev.rules:1.93 core/base/udev/udev.rules:1.94
--- core/base/udev/udev.rules:1.93 Thu Feb 21 01:29:54 2008
+++ core/base/udev/udev.rules Thu Mar 6 01:45:22 2008
@@ -40,6 +40,9 @@
ENV{DRIVER}=="?*", SUBSYSTEM!="input", GOTO="hotplug_driver_loaded"
ACTION!="add", GOTO="hotplug_not_add_event"
+#Skip auto-loading of framebuffer devices
+KERNEL=="fb[0-9]*", GOTO="hotplug_driver_loaded"
+
# Modaliases to load
ENV{MODALIAS}=="?*", RUN{ignore_error}+="/lib/udev/load-modules.sh $env{MODALIAS}"
More information about the arch-commits
mailing list