From: Chris Gianelloni <wolf31o2@gentoo.org>
Date: Fri, 29 Jul 2005 20:40:40 +0000 (+0000)
Subject: Fixed up the BladeCenter support some more.
X-Git-Tag: v3.4.10.902~460
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=c6e93a1f93333f5578c720e66ad4d105e4cab04f;p=genkernel.git

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 30cfc44..fa97710 100644
--- 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 402035f..63cd5f7 100644
--- 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 6e161af..9a05d28 100644
--- 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\=*)