Finally making the --bladecenter/dobladecenter stuff correct. Thanks plasmaroo for...

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 e3df74a628024f3638c75e34239f1d939c84dff4..63b5c0c0c9f76b80650bb9f0418ae45701e92055 100644 (file)
--- 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 fa97710947e330dd944b4a3c105fd55dda767bb9..35df9df40fbcf142a85f006df35e6931e179c638 100644 (file)
--- 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 63cd5f721b3e3e5cd29f778707ee4185e020e1bb..a990cb68f72187003ce18046e6bded3f450d2ae1 100644 (file)
--- 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 1addb959f619f06b767a8feb9977f4b7e104f7c9..f7f323b274080a8dd7edbfedba62538538329efd 100644 (file)
--- 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 bc8830fb8780e533eb4e1163c38e308ec1154b67..ab74e829df63053db60519497ce40d2a79c876f3 100644 (file)
--- 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 9a05d2889613e7bb0ed0e6f98c0e64ffb88a1466..58e2e0eb4e137e6fbda725a08a62c257f82138b3 100644 (file)
--- 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 76a3a164455e388b5f8cce50f9483f5e4bc44740..9c720e9fd073f17fd28af2e3d35feb32031cf571 100755 (executable)
--- 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.