From: Andrew Gaffney <agaffney@gentoo.org>
Date: Tue, 18 Sep 2007 21:10:09 +0000 (+0000)
Subject: we don't ever want devfs in an initramfs
X-Git-Tag: v3.4.10.902~208
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=2dd522a1edccd5ea711c7e3ed5f63241030a0490;p=genkernel.git

we don't ever want devfs in an initramfs
check KERN_24 instead of DEVFS for 2.4 initrd generation

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

diff --git a/ChangeLog b/ChangeLog
index cf71c8a..89649e1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,11 @@
 # Copyright 2006-2007 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  18 Sep 2007; Andrew Gaffney <agaffney@gentoo.org> gen_initramfs.sh,
+  gen_initrd.sh:
+  we don't ever want devfs in an initramfs
+  check KERN_24 instead of DEVFS for 2.4 initrd generation
+
   17 Sep 2007; Chris Gianelloni <wolf31o2@gentoo.org> gen_cmdline.sh,
   gen_compile.sh, gen_determineargs.sh, gen_funcs.sh, gen_initrd.sh,
   genkernel, genkernel.8, genkernel.conf:
diff --git a/gen_initramfs.sh b/gen_initramfs.sh
index ae41083..2d04504 100644
--- a/gen_initramfs.sh
+++ b/gen_initramfs.sh
@@ -430,7 +430,7 @@ create_initramfs() {
 	append_data 'base_layout'
 	append_data 'auxilary'
 	append_data 'busybox' "${BUSYBOX}"
-	append_data 'devfs' "${DEVFS}"
+#	append_data 'devfs' "${DEVFS}"
 	append_data 'unionfs_modules' "${UNIONFS}"
 	append_data 'unionfs_tools' "${UNIONFS}"
 	append_data 'lvm' "${LVM}"
diff --git a/gen_initrd.sh b/gen_initrd.sh
index 46f8d07..072e738 100644
--- a/gen_initrd.sh
+++ b/gen_initrd.sh
@@ -85,7 +85,7 @@ create_base_initrd_sys() {
 	chmod +x "${TEMP}/initrd-temp/bin/busybox"
 
 	# devfsd
-	if [ "${DEVFS}" -eq '1' ]
+	if [ "${KERN_24}" -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!'