From 879626254d84480fd059eb6cdb6c6f76de9f5011 Mon Sep 17 00:00:00 2001
From: Tim Yamin <plasmaroo@gentoo.org>
Date: Wed, 28 Jul 2004 10:17:25 +0000
Subject: [PATCH] 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
---
 gen_compile.sh  |  2 +-
 generic/linuxrc | 11 ++++++-----
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/gen_compile.sh b/gen_compile.sh
index 5d7e550..ef70264 100644
--- 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 fa1679a..e053bcb 100644
--- 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
 
-- 
2.26.2