summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Schwarzott <zzam@gentoo.org>2007-03-17 10:42:15 +0000
committerMatthias Schwarzott <zzam@gentoo.org>2007-03-17 10:42:15 +0000
commitb75325763b3e09f7b76132e6d32b974c0c62789b (patch)
treef307059ce0357509db9d9240be677716e73d4d73
parentx86-fbsd fixups, bug#171217, Thanks to ebfe (diff)
downloadgentoo-2-b75325763b3e09f7b76132e6d32b974c0c62789b.tar.gz
gentoo-2-b75325763b3e09f7b76132e6d32b974c0c62789b.tar.bz2
gentoo-2-b75325763b3e09f7b76132e6d32b974c0c62789b.zip
Backported non-modular kernel fix toget it into release, Bug #168322.
(Portage version: 2.1.2.2)
-rw-r--r--sys-fs/udev/ChangeLog6
-rwxr-xr-xsys-fs/udev/files/modprobe-104-r12.sh3
2 files changed, 8 insertions, 1 deletions
diff --git a/sys-fs/udev/ChangeLog b/sys-fs/udev/ChangeLog
index becf70ddadc0..19f2870bc4f4 100644
--- a/sys-fs/udev/ChangeLog
+++ b/sys-fs/udev/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for sys-fs/udev
# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.285 2007/03/14 15:51:44 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.286 2007/03/17 10:42:15 zzam Exp $
+
+ 17 Mar 2007; Matthias Schwarzott <zzam@gentoo.org>
+ files/modprobe-104-r12.sh:
+ Backported non-modular kernel fix toget it into release, Bug #168322.
14 Mar 2007; Matthias Schwarzott <zzam@gentoo.org>
-files/udev.rules-104-r7, -files/udev-start-104-r5.sh,
diff --git a/sys-fs/udev/files/modprobe-104-r12.sh b/sys-fs/udev/files/modprobe-104-r12.sh
index c22a10a62aa2..500fd9c8e527 100755
--- a/sys-fs/udev/files/modprobe-104-r12.sh
+++ b/sys-fs/udev/files/modprobe-104-r12.sh
@@ -1,5 +1,8 @@
#!/bin/bash
+# Do not continue for non-modular kernel - Bug #168322
+[ ! -f /proc/modules ] && exit 0
+
if [[ -e /dev/.udev_populate ]]; then
# Enable verbose while called from udev-addon-start
source /dev/.udev_populate