Fixed up the BladeCenter support some more.

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

diff --git a/gen_initramfs.sh b/gen_initramfs.sh
index 30cfc4403b2120e4e3c81269217b3d72af377390..fa97710947e330dd944b4a3c105fd55dda767bb9 100644 (file)
--- a/gen_initramfs.sh
+++ b/gen_initramfs.sh
@@ -34,6 +34,10 @@ create_base_layout_cpio() {
        mknod -m 660 null c 1 3
        mknod -m 600 tty1 c 4 1
        cd "${TEMP}/initramfs-base-temp/"
+       if [ "${BLADECENTER}" -eq '1' ]
+       then
+               echo "BLADECENTER=1" >> ${TEMP}/initramfs-base-temp/etc/startup.conf
+       fi
        find . -print | cpio --quiet -o -H newc | gzip -9 > ${CACHE_CPIO_DIR}/initramfs-base-layout.cpio.gz
        rm -rf "${TEMP}/initramfs-base-temp" > /dev/null
 }

diff --git a/gen_initrd.sh b/gen_initrd.sh
index 402035fc63d54ed499603df569b8f4d654b7d5ec..63cd5f721b3e3e5cd29f778707ee4185e020e1bb 100644 (file)
--- a/gen_initrd.sh
+++ b/gen_initrd.sh
@@ -56,6 +56,10 @@ create_base_initrd_sys() {
        cd ${TEMP}/initrd-temp/dev
        MAKEDEV std
        MAKEDEV console
+       if [ "${BLADECENTER}" -eq '1' ]
+       then
+               echo "BLADECENTER=1" >> ${TEMP}/initrd-temp/etc/startup.conf
+       fi
        
        if [ "${DISKLABEL}" -eq '1' ]; then
                cp "${BLKID_BINCACHE}" "${TEMP}/initrd-temp/bin/blkid.bz2" ||

diff --git a/generic/linuxrc b/generic/linuxrc
index 6e161aff4d043daf104771b831aef58851da6710..9a05d2889613e7bb0ed0e6f98c0e64ffb88a1466 100644 (file)
--- a/generic/linuxrc
+++ b/generic/linuxrc
@@ -5,6 +5,7 @@
 
 . /etc/initrd.defaults
 . /etc/initrd.scripts
+. /etc/startup.conf
 
 splash() {
        return 0
@@ -138,9 +139,14 @@ do
       scandelay)
          SDELAY=10
          ;;
+
+         # IBM BladeCenter support
          bladecenter)
          BLADECENTER=1
          ;;
+         nobladecenter)
+         BLADECENTER=0
+         ;;
 
       # Module no-loads
       noload\=*)