Fix for "udev" not having to be passed to the linuxrc; and a fix for the

devfsd bincache not being used.

git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/genkernel/trunk@120 67a159dc-881f-0410-a524-ba9dfbe2cb84

diff --git a/gen_compile.sh b/gen_compile.sh
index 5d7e550229bdcaf29257b4aee11ff052b622d016..ef702648f24993902925b0d6398a2f7b99a5ff77 100644 (file)
--- a/gen_compile.sh
+++ b/gen_compile.sh
@@ -371,7 +371,7 @@ compile_module_init_tools() {
 
 compile_devfsd() {
        local ARGS
-       if [ ! -f "${DEVFSD_BINCACHE}" -o ! -f "${DEVFSD_CONF_BINCACHE}" ]
+       if [ ! -f "${DEVFSD_BINCACHE}" ]
        then
                [ ! -f "${DEVFSD_SRCTAR}" ] &&
                        gen_die "Could not find devfsd source tarball: ${DEVFSD_SRCTAR}"

diff --git a/generic/linuxrc b/generic/linuxrc
index fa1679a0d23c10916cbc0e547d25603bb7bc8772..e053bcbcb693637c2615c030722a38bb160ab358 100644 (file)
--- a/generic/linuxrc
+++ b/generic/linuxrc
@@ -146,6 +146,11 @@ then
        fi
 fi
 
+# Check udev is on...
+[ "${KMAJOR}" -ge 2 ] && USE_UDEV_SUPPORT=1
+[ "${KMAJOR}" -eq 2 -a "${KMINOR}" -ge '6' ] && USE_UDEV_SUPPORT=1
+[ "${USE_UDEV_SUPPORT}" -eq '1' -a -f /sbin/udev -a "${USE_UDEV_NORMAL}" -ne 0 ] && USE_UDEV_NORMAL=1
+
 # Disable udev support if /dev is already mounted as devfs
 [ -e /dev/.devfsd ] && USE_UDEV_NORMAL=0
 
@@ -160,14 +165,10 @@ then
        [ "$?" -eq "0" ] || USE_UDEV_NORMAL=0
 fi
 
-# Check udev is on...
-[ "${KMAJOR}" -ge 2 ] && USE_UDEV_SUPPORT=1
-[ "${KMAJOR}" -eq 2 -a "${KMINOR}" -ge '6' ] && USE_UDEV_SUPPORT=1
-[ "${USE_UDEV_SUPPORT}" -eq '1' -a -f /sbin/udev -a "${USE_UDEV_NORMAL}" -ne 0 ] && USE_UDEV_NORMAL=1
-
 # Don't do else b/c we set CDROOT=0 if it fails to detect
 if [ "${USE_UDEV_NORMAL}" -eq '1' -a "${CDROOT}" -eq '0' ]
 then
+       USE_DEVFS_NORMAL=0
        export ACTION=add
        export UDEV_NO_SLEEP=1