From 5d10cd3ce01e6fe720f9f5813c84649cba068ca0 Mon Sep 17 00:00:00 2001 From: Tobias Hintze Date: Mon, 13 Mar 2006 10:56:33 +0000 Subject: [PATCH] Tobias Hintze : fixes for bootdisk when disks are SCSI: extract all SCSI modules, make initrd bigger, add some more SCSI modules to kernel.conf, add basename+tr to stage1 for udev-script git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@7121 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc --- target/bootdisk/build_stage1.sh | 14 ++++---------- target/bootdisk/kernel.conf | 10 ++++++++-- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/target/bootdisk/build_stage1.sh b/target/bootdisk/build_stage1.sh index 588016296..e410624d8 100644 --- a/target/bootdisk/build_stage1.sh +++ b/target/bootdisk/build_stage1.sh @@ -33,7 +33,7 @@ sed -i -e "s,^STAGE_2_BIG_IMAGE=\"2nd_stage.tar.gz\"$,STAGE_2_BIG_IMAGE=\"${ROCK echo_status "Copy various helper applications." for file in ../2nd_stage/bin/{tar,gzip,bash2,bash,sh,mount,umount,ls,cat,uname,rm,ln,mkdir,rmdir,gawk,awk,grep,sleep} \ ../2nd_stage/sbin/{ip,hwscan,pivot_root,swapon,swapoff,udevstart} \ - ../2nd_stage/usr/bin/{wget,find,expand,readlink} \ + ../2nd_stage/usr/bin/{wget,find,expand,readlink,basename,tr} \ ../2nd_stage/usr/sbin/lspci ; do programs="${programs} ${file#../2nd_stage}" cp ${file} bin/ @@ -54,14 +54,8 @@ for x in modprobe.static modprobe.static.old insmod.static insmod.static.old ; d done echo_status "Copy scsi and network kernel modules." -for x in ../2nd_stage/lib/modules/*/kernel/drivers/{scsi,net}/*.{ko,o} ; do - # this test is needed in case there are only .o or only .ko files - if [ -f $x ]; then - xx=${x#../2nd_stage/} - mkdir -p $( dirname $xx ) ; cp $x $xx - $STRIP --strip-debug $xx # stripping more breaks the object - fi -done +( cd ../2nd_stage ; tar cf - lib/modules/*/kernel/drivers/{scsi,net} ) | tar xf - +find lib/modules -type f -exec $STRIP --strip-debug {} \; for x in ../2nd_stage/lib/modules/*/modules.{dep,pcimap,isapnpmap} ; do cp $x ${x#../2nd_stage/} || echo "not found: $x" ; @@ -114,7 +108,7 @@ cd .. echo_header "Creating initrd filesystem image: " -ramdisk_size=8192 +ramdisk_size=16384 echo_status "Creating temporary files." tmpdir=initrd_$$.dir; mkdir -p $disksdir/$tmpdir; cd $disksdir diff --git a/target/bootdisk/kernel.conf b/target/bootdisk/kernel.conf index f95fcb3b5..106aed977 100644 --- a/target/bootdisk/kernel.conf +++ b/target/bootdisk/kernel.conf @@ -28,8 +28,14 @@ CONFIG_BLK_DEV_IDECD=y CONFIG_DEBUG_KERNEL=y CONFIG_MAGIC_SYSRQ=y -# ramdisk size of 8192 KB -CONFIG_BLK_DEV_RAM_SIZE=8192 +# ramdisk size of 16384 KB +CONFIG_BLK_DEV_RAM_SIZE=16384 # console on serial port CONFIG_SERIAL_8250_CONSOLE=y + +CONFIG_MEGARAID_NEWGEN=y +CONFIG_MEGARAID_MM=m +CONFIG_MEGARAID_MAILBOX=m +CONFIG_MEGARAID_SAS=m +