From: Chris Gianelloni <wolf31o2@gentoo.org>
Date: Sat, 2 Feb 2008 17:21:23 +0000 (+0000)
Subject: Removed runUdev, since we no longer use it.
X-Git-Tag: v3.4.10.902~171
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=2df80062d668c271bcdd67683334b652591f8165;p=genkernel.git

Removed runUdev, since we no longer use it.

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

diff --git a/ChangeLog b/ChangeLog
index 1ce810c..6ec1085 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 2006-2008 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  02 Feb 2008; Chris Gianelloni <wolf31o2@gentoo.org>
+  generic/initrd.defaults, generic/initrd.scripts:
+  Removed runUdev, since we no longer use it.
+
   11 Jan 2008; Chris Gianelloni <wolf31o2@gentoo.org> gen_initramfs.sh,
   gen_initrd.sh, genkernel:
   Fixing a problem where we were copying the busybox binary cache into the
diff --git a/generic/initrd.defaults b/generic/initrd.defaults
index c45eb35..5d0a2b0 100644
--- a/generic/initrd.defaults
+++ b/generic/initrd.defaults
@@ -52,7 +52,7 @@ KV="`uname -r`"
 KMAJOR=`echo $KV | cut -f1 -d.`
 KMINOR=`echo $KV | cut -f2 -d.`
 KVER="${KMAJOR}.${KMINOR}"
-MISCOPTS='idebug detect'
+MISCOPTS='debug detect'
 
 if [ "${KMAJOR}" -eq 2 -a "${KMINOR}" -ge '6' ]
 then
diff --git a/generic/initrd.scripts b/generic/initrd.scripts
index f6a8d41..9f2351c 100644
--- a/generic/initrd.scripts
+++ b/generic/initrd.scripts
@@ -269,8 +269,8 @@ findnfsmount() {
 				else
 					bad_msg "NFS Mounting failed. Is the path correct ?"
 				fi
-				# FIXME: Need to start portmap and the other rpc daemons in order to
-				# FIXME: remount rw.
+				# FIXME: Need to start portmap and the other rpc daemons in
+				# order to remount rw.
 			fi
 
 		fi
@@ -297,32 +297,6 @@ run_shell() {
 	/bin/ash
 }
 
-runUdev() {
-	mount -t tmpfs -o size=100k udev /dev
-	mkdir /dev/pts
-	mkdir /dev/shm
-	echo  > /proc/sys/kernel/hotplug 
-	/sbin/udevd --daemon
-	mkdir -p /dev/.udev/queue
-	/sbin/udevtrigger
-
-	good_msg 'Letting udev process events'
-	loop=0
-	while test -d /dev/.udev/queue; do
-		sleep 1;
-		test "$loop" -gt 30 && break
-		loop=$(($loop + 1))
-	done
-	good_msg "Udev finished proccsing after $loop iterations"
-
-	killall udevd > /dev/null 2>&1
-	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
-}
-
 runmdev() {
 	# busybox udev replacement
 	mdev -s
@@ -379,7 +353,8 @@ crypt_filter() {
 }
 
 whereis(){
-	# $1 = variable whose value is the path (examples: "REAL_ROOT", "LUKS_KEYDEV")
+	# $1 = variable whose value is the path (examples: "REAL_ROOT",
+	#      "LUKS_KEYDEV")
 	# $2 = label
 	# $3 = optional explanations for failure
 
@@ -431,7 +406,6 @@ start_dev_mgr() {
 		[ "${DO_slowusb}" ] && sleep 10
 		kill_devfsd
 		good_msg 'Activating mdev'
-#		runUdev
 		runmdev
 		[ "${DO_slowusb}" ] && sleep 20
 		cd /