From: Chris Gianelloni <wolf31o2@gentoo.org>
Date: Tue, 12 Sep 2006 14:53:06 +0000 (+0000)
Subject: The initrd code was still looking for udev, even though we aren't building it anymore... 
X-Git-Tag: v3.4.10.902~316
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=e22b578be7c20252f3229e1637423cd513e722cd;p=genkernel.git

The initrd code was still looking for udev, even though we aren't building it anymore.  This should fix bug #145802.


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

diff --git a/gen_initrd.sh b/gen_initrd.sh
index 7c7cc07..f197995 100644
--- a/gen_initrd.sh
+++ b/gen_initrd.sh
@@ -104,7 +104,7 @@ create_base_initrd_sys() {
 	fi
 
 	# devfsd
-	if [ "${UDEV}" != '1' ]
+	if [ "${DEVFS}" -eq '1' ]
 	then
 		cp "${DEVFSD_BINCACHE}" "${TEMP}/initrd-temp/bin/devfsd.bz2" || gen_die 'Could not copy devfsd executable from bincache!'
 		bunzip2 "${TEMP}/initrd-temp/bin/devfsd.bz2" || gen_die 'Could not uncompress devfsd!'
@@ -112,20 +112,19 @@ create_base_initrd_sys() {
 	fi
 
 	# udev
-	if [ "${UDEV}" -eq '1' ]
-	then
-		/bin/tar -jxpf "${UDEV_BINCACHE}" -C "${TEMP}/initrd-temp" || gen_die 'Could not extract udev binary cache!'
-		if [ ! -e "${TEMP}/initrd-temp/bin/udevstart" ]
-		then
-		    ln -sf "./udev" "${TEMP}/initrd-temp/bin/udevstart" || 	gen_die 'Could not symlink udev -> udevstart!'
-		fi
+#	if [ "${UDEV}" -eq '1' ]
+#	then
+#		/bin/tar -jxpf "${UDEV_BINCACHE}" -C "${TEMP}/initrd-temp" || gen_die 'Could not extract udev binary cache!'
+#		if [ ! -e "${TEMP}/initrd-temp/bin/udevstart" ]
+#		then
+#		    ln -sf "./udev" "${TEMP}/initrd-temp/bin/udevstart" || 	gen_die 'Could not symlink udev -> udevstart!'
+#		fi
 		
-		if [ ! -e "${TEMP}/initrd-temp/bin/udevsend" ]
-		then
-		    ln -sf "./udev" "${TEMP}/initrd-temp/bin/udevsend" || 	gen_die 'Could not symlink udev -> udevsend!'
-		fi
-
-	fi
+#		if [ ! -e "${TEMP}/initrd-temp/bin/udevsend" ]
+#		then
+#		    ln -sf "./udev" "${TEMP}/initrd-temp/bin/udevsend" || 	gen_die 'Could not symlink udev -> udevsend!'
+#		fi
+#	fi
 	
 	#unionfs modules
 	if [ "${UNIONFS}" -eq '1' ]