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 cf71c8a38474b5c3f304e4252ec2c6f4f80aecc5..89649e1a62af4b086bc31ce6ac1ec09a755c790f 100644 (file)
--- 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 ae410833ebc6097e5440ef5803b5c5dde305fa32..2d045040e85fe192a2c10a46d738758307240402 100644 (file)
--- 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 46f8d07837f9c891ab68b407f581e0d2fa384699..072e73879e9978274136714b16c6382742014620 100644 (file)
--- 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!'