From: Chris Gianelloni <wolf31o2@gentoo.org>
Date: Sat, 30 Jul 2005 14:24:29 +0000 (+0000)
Subject: Finally making the --bladecenter/dobladecenter stuff correct.  Thanks plasmaroo for... 
X-Git-Tag: v3.4.10.902~458
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=e3344146cc8d6ad267eb2a4decdfa6969e88ee75;p=genkernel.git

Finally making the --bladecenter/dobladecenter stuff correct.  Thanks plasmaroo for helping me wrap my head around how this works and to remove my dirty hack.


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

diff --git a/gen_determineargs.sh b/gen_determineargs.sh
index e3df74a..63b5c0c 100644
--- a/gen_determineargs.sh
+++ b/gen_determineargs.sh
@@ -391,13 +391,6 @@ determine_real_args() {
 		BUSYBOX=1
 	fi
 
-	if isTrue "${CMD_BLADECENTER}"
-	then
-		BLADECENTER=1
-	else
-		BLADECENTER=0
-	fi
-	
 	if isTrue "${CMD_DMRAID}"
 	then
 		DMRAID=1
diff --git a/gen_initramfs.sh b/gen_initramfs.sh
index fa97710..35df9df 100644
--- a/gen_initramfs.sh
+++ b/gen_initramfs.sh
@@ -34,10 +34,6 @@ 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
 }
@@ -408,6 +404,10 @@ create_initramfs_aux() {
 	fi
 	mkdir -p "${TEMP}/initramfs-aux-temp/lib/keymaps"
 	/bin/tar -C "${TEMP}/initramfs-aux-temp/lib/keymaps" -zxf "${GK_SHARE}/generic/keymaps.tar.gz"
+	if isTrue $CMD_BLADECENTER
+	then
+		echo 'MY_HWOPTS="${MY_HWOPTS} bladecenter"' >> ${TEMP}/initramfs-aux-temp/etc/initrd.defaults
+	fi
 
 	cd ${TEMP}/initramfs-aux-temp/sbin && ln -s ../init init
 	cd ${TEMP}
diff --git a/gen_initrd.sh b/gen_initrd.sh
index 63cd5f7..a990cb6 100644
--- a/gen_initrd.sh
+++ b/gen_initrd.sh
@@ -56,11 +56,7 @@ 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" ||
 			gen_die 'Could not copy blkid from bincache!'
@@ -297,6 +293,10 @@ create_initrd_aux() {
 	fi
 	mkdir -p "${TEMP}/initrd-temp/lib/keymaps"
 	/bin/tar -C "${TEMP}/initrd-temp/lib/keymaps" -zxf "${GK_SHARE}/generic/keymaps.tar.gz"
+	if isTrue $CMD_BLADECENTER
+	then
+		echo 'MY_HWOPTS="${MY_HWOPTS} bladecenter"' >> ${TEMP}/initrd-temp/etc/initrd.defaults
+	fi
 
 	cd ${TEMP}/initrd-temp/sbin && ln -s ../linuxrc init
 	cd ${OLDPWD}
diff --git a/generic/initrd.defaults b/generic/initrd.defaults
index 1addb95..f7f323b 100644
--- a/generic/initrd.defaults
+++ b/generic/initrd.defaults
@@ -78,5 +78,5 @@ CONSOLE="/dev/console"
 
 # Only sections that are in by default or those that
 # are not module groups need to be defined here...
-HWOPTS='usb firewire keymap cache evms2 sata lvm2 dmraid'
+HWOPTS='usb firewire keymap cache evms2 sata lvm2 dmraid bladecenter'
 MY_HWOPTS='usb firewire sata dmraid'
diff --git a/generic/initrd.scripts b/generic/initrd.scripts
index bc8830f..ab74e82 100644
--- a/generic/initrd.scripts
+++ b/generic/initrd.scripts
@@ -265,11 +265,11 @@ start_dev_mgr(){
     if [ "${USE_UDEV_NORMAL}" -eq '1' ]
     then
 		cd /sys
-		[ "${BLADECENTER}" -eq '1' ] && sleep 10
+		[ "${DO_bladecenter}" -eq '1' ] && sleep 10
 		kill_devfsd
 		good_msg 'Activating udev'
 		runUdev
-		[ "${BLADECENTER}" -eq '1' ] && sleep 20
+		[ "${DO_bladecenter}" -eq '1' ] && sleep 20
 		cd /
     else
 		if [ ! -e /dev/.devfsd ]
diff --git a/generic/linuxrc b/generic/linuxrc
index 9a05d28..58e2e0e 100644
--- a/generic/linuxrc
+++ b/generic/linuxrc
@@ -5,7 +5,6 @@
 
 . /etc/initrd.defaults
 . /etc/initrd.scripts
-. /etc/startup.conf
 
 splash() {
 	return 0
@@ -140,14 +139,6 @@ do
 	  SDELAY=10
 	  ;;
 
-	  # IBM BladeCenter support
-	  bladecenter)
-	  BLADECENTER=1
-	  ;;
-	  nobladecenter)
-	  BLADECENTER=0
-	  ;;
-
       # Module no-loads
       noload\=*)
 	  MLIST=`parse_opt "${x}"`
@@ -548,7 +539,7 @@ then
 			fi
 		done
 
-		[ "${BLADECENTER}" -eq '1' ] && sleep 10
+		[ "${DO_bladecenter}" -eq '1' ] && sleep 10
 		mkdir initrd proc tmp sys 2>/dev/null
 		chmod 1777 tmp
 	fi
@@ -563,7 +554,7 @@ then
 	# Let Init scripts know that we booted from CD
 	export CDBOOT
 	CDBOOT=1
-	[ "${BLADECENTER}" -eq '1' ] && sleep 10
+	[ "${DO_bladecenter}" -eq '1' ] && sleep 10
 else
 	mkdir -p ${NEW_ROOT}/tmp/.initrd
 fi
@@ -587,7 +578,7 @@ then
 	cd ${CHROOT}
 	mkdir ${CHROOT}/proc ${CHROOT}/sys 2>/dev/null
 	pivot_root . tmp/.initrd
-	[ "${BLADECENTER}" -eq '1' ] && sleep 10
+	[ "${DO_bladecenter}" -eq '1' ] && sleep 10
 	echo -n '.'
 
 	if /tmp/.initrd/bin/[ "${USE_DEVFS_NORMAL}" -eq '1' -a "${CDROOT}" -eq '0' ]
diff --git a/genkernel b/genkernel
index 76a3a16..9c720e9 100755
--- a/genkernel
+++ b/genkernel
@@ -2,7 +2,7 @@
 # Genkernel v3
 
 PATH="/bin:/usr/bin:/sbin:/usr/sbin"
-GK_V='3.3.3'
+GK_V='3.3.4'
 
 TMPDIR='/var/tmp/genkernel'
 TODEBUGCACHE=1 # Until an error occurs or DEBUGFILE is fully qualified.