From 65d94396868668d057e352e8159069182b895d5c Mon Sep 17 00:00:00 2001 From: Matt Housh Date: Fri, 17 Sep 2010 15:04:55 -0500 Subject: [PATCH] Updated busybox, removed deprecated IDE drivers, added MemTest86+ target, tweaks/fixes --- Makefile | 33 ++++- ...ox-1.16.2.config => busybox-1.17.2.config} | 128 ++++++++++++------ initramfs/init | 121 +++++++++-------- initramfs/initramfs.lst | 60 +++----- iso/isolinux/modules.msg | 16 +-- kernel/linux-2.6.35.4.config | 89 +----------- 6 files changed, 208 insertions(+), 239 deletions(-) rename busybox/{busybox-1.16.2.config => busybox-1.17.2.config} (95%) diff --git a/Makefile b/Makefile index 38f01fc..378a59a 100644 --- a/Makefile +++ b/Makefile @@ -9,8 +9,9 @@ COLLECTIONS = core opt xorg KERNEL_MIRROR = ftp://ftp.kernel.org KERNEL_VERSION = 2.6.35.4 KERNEL_PATCHES = -BB_VERSION = 1.16.2 +BB_VERSION = 1.17.2 SYSLINUX_VERSION = 3.86 +MEMTEST_VERSION = 4.10 SQUASHFS_VERSION = 4.0 PKG_EXT = pkg.tar.xz PKGMK_CONF = $(PWD)/pkgmk.conf @@ -48,7 +49,9 @@ else PKGMK_DOWNLOAD=-d endif -.PHONY: help check-root check-log $(COLLECTIONS) all all-chroot bootstrap kernel kernel-clean syslinux syslinux-clean clean iso +.PHONY: help check-root check-log $(COLLECTIONS) all all-chroot bootstrap \ + kernel kernel-clean syslinux syslinux-clean clean iso busybox-clean \ + unsquashfs-clean initramfs-clean memtest-clean help: @echo "CRUX Makefile" @@ -148,9 +151,26 @@ syslinux-distclean: +# memtest86+ +iso/isolinux/memtest86+-$(MEMTEST_VERSION).bin.gz: + cd iso/isolinux && wget http://www.memtest.org/download/$(MEMTEST_VERSION)/memtest86+-$(MEMTEST_VERSION).bin.gz + +iso/isolinux/memtest86+-$(MEMTEST_VERSION).bin: iso/isolinux/memtest86+-$(MEMTEST_VERSION).bin.gz + zcat iso/isolinux/memtest86+-$(MEMTEST_VERSION).bin.gz > iso/isolinux/memtest86+-$(MEMTEST_VERSION).bin + +memtest: iso/isolinux/memtest86+-$(MEMTEST_VERSION).bin + +memtest-clean: + rm -f iso/isolinux/memtest86+-$(MEMTEST_VERSION).bin + +memtest-distclean: memtest-clean + rm -f iso/isolinux/memtest86+-$(MEMTEST_VERSION).bin.gz + + + # unsquashfs iso/squashfs$(SQUASHFS_VERSION).tar.gz: - cd iso && wget http://dl.sourceforge.net/sourceforge/squashfs/squashfs$(SQUASHFS_VERSION).tar.gz + cd iso && wget http://download.sourceforge.net/squashfs/squashfs$(SQUASHFS_VERSION).tar.gz iso/squashfs$(SQUASHFS_VERSION): iso/squashfs$(SQUASHFS_VERSION).tar.gz tar -C iso -xzmf iso/squashfs$(SQUASHFS_VERSION).tar.gz @@ -165,7 +185,7 @@ unsquashfs: iso/squashfs$(SQUASHFS_VERSION)/squashfs-tools/unsquashfs unsquashfs-clean: rm -rf iso/squashfs$(SQUASHFS_VERSION) -unsquashfs-distclean: +unsquashfs-distclean: unsquashfs-clean rm -f iso/squashfs$(SQUASHFS_VERSION).tar.gz @@ -380,12 +400,13 @@ image-base: check-root kernel syslinux initramfs squashfs setup.dependencies uns ##### iso image building ##### -iso: image-base +iso: image-base memtest @echo "Copying ISO specific files" @mkdir -p $(IMG_ROOT_DIR)/boot/isolinux @cp iso/syslinux-$(SYSLINUX_VERSION)/core/isolinux.bin $(IMG_ROOT_DIR)/boot/isolinux - @cp iso/isolinux/{isolinux.cfg,*.msg,memtest86plus} \ + @cp iso/isolinux/{isolinux.cfg,*.msg} \ $(IMG_ROOT_DIR)/boot/isolinux + @cp iso/isolinux/memtest86+-$(MEMTEST_VERSION).bin $(IMG_ROOT_DIR)/boot/isolinux/memtest86plus @echo "- Creating ISO sort table" @echo "$(IMG_ROOT_DIR)/boot 100" > /tmp/iso.sort @echo "$(IMG_ROOT_DIR)/boot/isolinux 200" >> /tmp/iso.sort diff --git a/busybox/busybox-1.16.2.config b/busybox/busybox-1.17.2.config similarity index 95% rename from busybox/busybox-1.16.2.config rename to busybox/busybox-1.17.2.config index 047b214..7fefedc 100644 --- a/busybox/busybox-1.16.2.config +++ b/busybox/busybox-1.17.2.config @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Busybox version: 1.16.2 -# Thu Jul 8 16:48:19 2010 +# Busybox version: 1.17.2 +# Thu Sep 16 20:28:58 2010 # CONFIG_HAVE_DOT_CONFIG=y @@ -24,11 +24,21 @@ CONFIG_FEATURE_VERBOSE_USAGE=y CONFIG_FEATURE_COMPRESS_USAGE=y CONFIG_FEATURE_INSTALLER=y # CONFIG_LOCALE_SUPPORT is not set -# CONFIG_FEATURE_ASSUME_UNICODE is not set +CONFIG_UNICODE_SUPPORT=y +# CONFIG_UNICODE_USING_LOCALE is not set # CONFIG_FEATURE_CHECK_UNICODE_IN_ENV is not set +CONFIG_SUBST_WCHAR=63 +CONFIG_LAST_SUPPORTED_WCHAR=767 +# CONFIG_UNICODE_COMBINING_WCHARS is not set +# CONFIG_UNICODE_WIDE_WCHARS is not set +# CONFIG_UNICODE_BIDI_SUPPORT is not set +# CONFIG_UNICODE_NEUTRAL_TABLE is not set +# CONFIG_UNICODE_PRESERVE_BROKEN is not set CONFIG_LONG_OPTS=y CONFIG_FEATURE_DEVPTS=y # CONFIG_FEATURE_CLEAN_UP is not set +# CONFIG_FEATURE_UTMP is not set +# CONFIG_FEATURE_WTMP is not set CONFIG_FEATURE_PIDFILE=y CONFIG_FEATURE_SUID=y # CONFIG_FEATURE_SUID_CONFIG is not set @@ -105,12 +115,14 @@ CONFIG_IOCTL_HEX2STR_ERROR=y # # Archival Utilities # +CONFIG_FEATURE_SEAMLESS_XZ=y CONFIG_FEATURE_SEAMLESS_LZMA=y CONFIG_FEATURE_SEAMLESS_BZ2=y CONFIG_FEATURE_SEAMLESS_GZ=y CONFIG_FEATURE_SEAMLESS_Z=y # CONFIG_AR is not set # CONFIG_FEATURE_AR_LONG_FILENAMES is not set +# CONFIG_FEATURE_AR_CREATE is not set CONFIG_BUNZIP2=y CONFIG_BZIP2=y # CONFIG_CPIO is not set @@ -134,19 +146,33 @@ CONFIG_FEATURE_TAR_FROM=y # CONFIG_FEATURE_TAR_OLDSUN_COMPATIBILITY is not set CONFIG_FEATURE_TAR_GNU_EXTENSIONS=y CONFIG_FEATURE_TAR_LONG_OPTIONS=y +CONFIG_FEATURE_TAR_TO_COMMAND=y CONFIG_FEATURE_TAR_UNAME_GNAME=y # CONFIG_FEATURE_TAR_NOPRESERVE_TIME is not set +# CONFIG_FEATURE_TAR_SELINUX is not set # CONFIG_UNCOMPRESS is not set # CONFIG_UNLZMA is not set # CONFIG_FEATURE_LZMA_FAST is not set +# CONFIG_LZMA is not set +CONFIG_UNXZ=y +CONFIG_XZ=y CONFIG_UNZIP=y # # Coreutils # CONFIG_BASENAME=y -# CONFIG_CAL is not set CONFIG_CAT=y +CONFIG_DATE=y +CONFIG_FEATURE_DATE_ISOFMT=y +# CONFIG_FEATURE_DATE_NANO is not set +CONFIG_FEATURE_DATE_COMPAT=y +CONFIG_TEST=y +CONFIG_FEATURE_TEST_64=y +CONFIG_TR=y +CONFIG_FEATURE_TR_CLASSES=y +CONFIG_FEATURE_TR_EQUIV=y +# CONFIG_CAL is not set # CONFIG_CATV is not set CONFIG_CHGRP=y CONFIG_CHMOD=y @@ -158,9 +184,6 @@ CONFIG_CHROOT=y CONFIG_CP=y # CONFIG_FEATURE_CP_LONG_OPTIONS is not set CONFIG_CUT=y -CONFIG_DATE=y -CONFIG_FEATURE_DATE_ISOFMT=y -CONFIG_FEATURE_DATE_COMPAT=y CONFIG_DD=y CONFIG_FEATURE_DD_SIGNAL_HANDLING=y # CONFIG_FEATURE_DD_THIRD_STATUS_LINE is not set @@ -241,12 +264,7 @@ CONFIG_TAIL=y CONFIG_FEATURE_FANCY_TAIL=y CONFIG_TEE=y CONFIG_FEATURE_TEE_USE_BLOCK_IO=y -CONFIG_TEST=y -CONFIG_FEATURE_TEST_64=y CONFIG_TOUCH=y -CONFIG_TR=y -CONFIG_FEATURE_TR_CLASSES=y -CONFIG_FEATURE_TR_EQUIV=y CONFIG_TRUE=y CONFIG_TTY=y CONFIG_UNAME=y @@ -282,6 +300,7 @@ CONFIG_FEATURE_HUMAN_READABLE=y # Console Utilities # CONFIG_CHVT=y +CONFIG_FGCONSOLE=y CONFIG_CLEAR=y CONFIG_DEALLOCVT=y # CONFIG_DUMPKMAP is not set @@ -300,6 +319,8 @@ CONFIG_DEFAULT_SETFONT_DIR="" # CONFIG_SETKEYCODES is not set # CONFIG_SETLOGCONS is not set # CONFIG_SHOWKEY is not set +# CONFIG_FEATURE_LOADFONT_PSF2 is not set +# CONFIG_FEATURE_LOADFONT_RAW is not set # # Debian Utilities @@ -317,7 +338,7 @@ CONFIG_WHICH=y # # Editors # -# CONFIG_AWK is not set +CONFIG_AWK=y # CONFIG_FEATURE_AWK_LIBM is not set CONFIG_CMP=y # CONFIG_DIFF is not set @@ -338,6 +359,7 @@ CONFIG_FEATURE_VI_READONLY=y CONFIG_FEATURE_VI_SETOPTS=y CONFIG_FEATURE_VI_SET=y CONFIG_FEATURE_VI_WIN_RESIZE=y +CONFIG_FEATURE_VI_ASK_TERMINAL=y CONFIG_FEATURE_VI_OPTIMIZE_CURSOR=y CONFIG_FEATURE_ALLOW_EXEC=y @@ -380,6 +402,9 @@ CONFIG_FEATURE_XARGS_SUPPORT_ZERO_TERM=y # # Init Utilities # +CONFIG_BOOTCHARTD=y +CONFIG_FEATURE_BOOTCHARTD_BLOATED_HEADER=y +CONFIG_FEATURE_BOOTCHARTD_CONFIG_FILE=y CONFIG_INIT=y CONFIG_FEATURE_USE_INITTAB=y # CONFIG_FEATURE_KILL_REMOVED is not set @@ -414,8 +439,6 @@ CONFIG_FIRST_SYSTEM_ID=0 CONFIG_LAST_SYSTEM_ID=0 # CONFIG_DELUSER is not set # CONFIG_GETTY is not set -# CONFIG_FEATURE_UTMP is not set -# CONFIG_FEATURE_WTMP is not set # CONFIG_LOGIN is not set # CONFIG_PAM is not set # CONFIG_LOGIN_SCRIPTS is not set @@ -437,10 +460,12 @@ CONFIG_LAST_SYSTEM_ID=0 # CONFIG_CHATTR is not set # CONFIG_FSCK is not set # CONFIG_LSATTR is not set +# CONFIG_TUNE2FS is not set # # Linux Module Utilities # +CONFIG_MODINFO=y CONFIG_MODPROBE_SMALL=y CONFIG_FEATURE_MODPROBE_SMALL_OPTIONS_ON_CMDLINE=y # CONFIG_FEATURE_MODPROBE_SMALL_CHECK_ALREADY_LOADED is not set @@ -471,6 +496,7 @@ CONFIG_DEFAULT_DEPMOD_FILE="modules.dep" # # Linux System Utilities # +CONFIG_REV=y # CONFIG_ACPID is not set # CONFIG_FEATURE_ACPID_COMPAT is not set # CONFIG_BLKID is not set @@ -490,6 +516,7 @@ CONFIG_FDISK_SUPPORT_LARGE_DISKS=y # CONFIG_FEATURE_OSF_LABEL is not set # CONFIG_FEATURE_FDISK_ADVANCED is not set # CONFIG_FINDFS is not set +CONFIG_FLOCK=y # CONFIG_FREERAMDISK is not set # CONFIG_FSCK_MINIX is not set # CONFIG_MKFS_EXT2 is not set @@ -520,24 +547,6 @@ CONFIG_MKSWAP=y # CONFIG_FEATURE_MKSWAP_UUID is not set # CONFIG_MORE is not set # CONFIG_FEATURE_USE_TERMIOS is not set -CONFIG_VOLUMEID=y -# CONFIG_FEATURE_VOLUMEID_EXT is not set -# CONFIG_FEATURE_VOLUMEID_BTRFS is not set -# CONFIG_FEATURE_VOLUMEID_REISERFS is not set -# CONFIG_FEATURE_VOLUMEID_FAT is not set -# CONFIG_FEATURE_VOLUMEID_HFS is not set -# CONFIG_FEATURE_VOLUMEID_JFS is not set -# CONFIG_FEATURE_VOLUMEID_XFS is not set -# CONFIG_FEATURE_VOLUMEID_NTFS is not set -# CONFIG_FEATURE_VOLUMEID_ISO9660 is not set -# CONFIG_FEATURE_VOLUMEID_UDF is not set -# CONFIG_FEATURE_VOLUMEID_LUKS is not set -# CONFIG_FEATURE_VOLUMEID_LINUXSWAP is not set -# CONFIG_FEATURE_VOLUMEID_CRAMFS is not set -# CONFIG_FEATURE_VOLUMEID_ROMFS is not set -# CONFIG_FEATURE_VOLUMEID_SYSV is not set -# CONFIG_FEATURE_VOLUMEID_OCFS2 is not set -# CONFIG_FEATURE_VOLUMEID_LINUXRAID is not set CONFIG_MOUNT=y CONFIG_FEATURE_MOUNT_FAKE=y CONFIG_FEATURE_MOUNT_VERBOSE=y @@ -565,11 +574,37 @@ CONFIG_FEATURE_UMOUNT_ALL=y # Common options for mount/umount # CONFIG_FEATURE_MOUNT_LOOP=y +CONFIG_FEATURE_MOUNT_LOOP_CREATE=y # CONFIG_FEATURE_MTAB_SUPPORT is not set +CONFIG_VOLUMEID=y + +# +# Filesystem/Volume identification +# +# CONFIG_FEATURE_VOLUMEID_EXT is not set +# CONFIG_FEATURE_VOLUMEID_BTRFS is not set +# CONFIG_FEATURE_VOLUMEID_REISERFS is not set +# CONFIG_FEATURE_VOLUMEID_FAT is not set +# CONFIG_FEATURE_VOLUMEID_HFS is not set +# CONFIG_FEATURE_VOLUMEID_JFS is not set +# CONFIG_FEATURE_VOLUMEID_XFS is not set +# CONFIG_FEATURE_VOLUMEID_NTFS is not set +# CONFIG_FEATURE_VOLUMEID_ISO9660 is not set +# CONFIG_FEATURE_VOLUMEID_UDF is not set +# CONFIG_FEATURE_VOLUMEID_LUKS is not set +# CONFIG_FEATURE_VOLUMEID_LINUXSWAP is not set +# CONFIG_FEATURE_VOLUMEID_CRAMFS is not set +# CONFIG_FEATURE_VOLUMEID_ROMFS is not set +# CONFIG_FEATURE_VOLUMEID_SYSV is not set +# CONFIG_FEATURE_VOLUMEID_OCFS2 is not set +# CONFIG_FEATURE_VOLUMEID_LINUXRAID is not set # # Miscellaneous Utilities # +# CONFIG_CONSPY is not set +# CONFIG_UBIATTACH is not set +# CONFIG_UBIDETACH is not set # CONFIG_ADJTIMEX is not set CONFIG_BBCONFIG=y # CONFIG_BEEP is not set @@ -634,6 +669,7 @@ CONFIG_FEATURE_LESS_MAXLINES=0 # CONFIG_MT is not set # CONFIG_RAIDAUTORUN is not set # CONFIG_READAHEAD is not set +# CONFIG_RFKILL is not set # CONFIG_RUNLEVEL is not set # CONFIG_RX is not set # CONFIG_SETSID is not set @@ -650,6 +686,10 @@ CONFIG_TIME=y # # Networking Utilities # +# CONFIG_NC is not set +# CONFIG_NC_SERVER is not set +# CONFIG_NC_EXTRA is not set +# CONFIG_NC_110_COMPAT is not set # CONFIG_FEATURE_IPV6 is not set # CONFIG_FEATURE_UNIX_LOCAL is not set # CONFIG_FEATURE_PREFER_IPV4_ADDRESS is not set @@ -723,9 +763,6 @@ CONFIG_IFUPDOWN_IFSTATE_PATH="" # CONFIG_FEATURE_IPCALC_LONG_OPTIONS is not set # CONFIG_NAMEIF is not set # CONFIG_FEATURE_NAMEIF_EXTENDED is not set -# CONFIG_NC is not set -# CONFIG_NC_SERVER is not set -# CONFIG_NC_EXTRA is not set # CONFIG_NETSTAT is not set # CONFIG_FEATURE_NETSTAT_WIDE is not set # CONFIG_FEATURE_NETSTAT_PRG is not set @@ -738,6 +775,7 @@ CONFIG_FEATURE_FANCY_PING=y # CONFIG_PSCAN is not set CONFIG_ROUTE=y # CONFIG_SLATTACH is not set +# CONFIG_TCPSVD is not set # CONFIG_TELNET is not set # CONFIG_FEATURE_TELNET_TTYPE is not set # CONFIG_FEATURE_TELNET_AUTOLOGIN is not set @@ -756,6 +794,8 @@ CONFIG_ROUTE=y # CONFIG_FEATURE_TRACEROUTE_VERBOSE is not set # CONFIG_FEATURE_TRACEROUTE_SOURCE_ROUTE is not set # CONFIG_FEATURE_TRACEROUTE_USE_ICMP is not set +# CONFIG_TUNCTL is not set +# CONFIG_FEATURE_TUNCTL_UG is not set # CONFIG_UDHCPD is not set # CONFIG_DHCPRELAY is not set # CONFIG_DUMPLEASES is not set @@ -769,16 +809,13 @@ CONFIG_UDHCP_DEBUG=0 CONFIG_UDHCPC_DEFAULT_SCRIPT="" CONFIG_UDHCPC_SLACK_FOR_BUGGY_SERVERS=0 CONFIG_IFUPDOWN_UDHCPC_CMD_OPTIONS="" +# CONFIG_UDPSVD is not set # CONFIG_VCONFIG is not set CONFIG_WGET=y CONFIG_FEATURE_WGET_STATUSBAR=y CONFIG_FEATURE_WGET_AUTHENTICATION=y CONFIG_FEATURE_WGET_LONG_OPTIONS=y # CONFIG_ZCIP is not set -# CONFIG_TCPSVD is not set -# CONFIG_TUNCTL is not set -# CONFIG_FEATURE_TUNCTL_UG is not set -# CONFIG_UDPSVD is not set # # Print Utilities @@ -801,6 +838,7 @@ CONFIG_FEATURE_MIME_CHARSET="" # # Process Utilities # +CONFIG_SMEMCAP=y CONFIG_FREE=y # CONFIG_FUSER is not set CONFIG_KILL=y @@ -863,9 +901,6 @@ CONFIG_SV_DEFAULT_SERVICE_DIR="" # # Shells # -CONFIG_FEATURE_SH_IS_ASH=y -# CONFIG_FEATURE_SH_IS_HUSH is not set -# CONFIG_FEATURE_SH_IS_NONE is not set CONFIG_ASH=y CONFIG_ASH_BASH_COMPAT=y CONFIG_ASH_JOB_CONTROL=y @@ -892,6 +927,12 @@ CONFIG_ASH_EXPAND_PRMT=y # CONFIG_HUSH_LOCAL is not set # CONFIG_HUSH_EXPORT_N is not set # CONFIG_HUSH_RANDOM_SUPPORT is not set +CONFIG_FEATURE_SH_IS_ASH=y +# CONFIG_FEATURE_SH_IS_HUSH is not set +# CONFIG_FEATURE_SH_IS_NONE is not set +# CONFIG_FEATURE_BASH_IS_ASH is not set +# CONFIG_FEATURE_BASH_IS_HUSH is not set +CONFIG_FEATURE_BASH_IS_NONE=y # CONFIG_LASH is not set # CONFIG_MSH is not set CONFIG_SH_MATH_SUPPORT=y @@ -908,6 +949,7 @@ CONFIG_SYSLOGD=y # CONFIG_FEATURE_ROTATE_LOGFILE is not set CONFIG_FEATURE_REMOTE_LOG=y # CONFIG_FEATURE_SYSLOGD_DUP is not set +CONFIG_FEATURE_SYSLOGD_READ_BUFFER_SIZE=256 CONFIG_FEATURE_IPC_SYSLOG=y CONFIG_FEATURE_IPC_SYSLOG_BUFFER_SIZE=16 CONFIG_LOGREAD=y diff --git a/initramfs/init b/initramfs/init index 2898d48..b39e5e1 100755 --- a/initramfs/init +++ b/initramfs/init @@ -43,8 +43,8 @@ find_and_mount_media() { echo -e " ${BOLD}${BLUE}*${NORM} Searching for the CRUX media..." mkdir /.tmpfs/.media CRUXMEDIA="" - CDROM_DEVICES="`grep 'drive name:' /proc/sys/dev/cdrom/info | cut -d: -f2`" - BLOCK_DEVICES="`grep -E '[sh]d' /proc/partitions | sed -e 's/.*\([sh]\)d/\1d/'`" + CDROM_DEVICES="`grep 'drive name:' /proc/sys/dev/cdrom/info | awk '{ print $3 }'`" + BLOCK_DEVICES="`grep -E '[sh]d' /proc/partitions | awk '{ print $4 }'`" for DEV in $CDROM_DEVICES $BLOCK_DEVICES do DEV="/dev/$DEV" @@ -143,6 +143,12 @@ echo "0" > /proc/sys/kernel/printk echo -e ", ${BOLD}${GREEN}/sys${NORM}." mount -t sysfs sysfs /sys +grep -q "debug" /proc/cmdline +if [ $? -eq 0 ] +then + DEBUG=1 +fi + echo -e -n " ${BOLD}${BLUE}*${NORM} Populating /dev via mdev... " mdev -s checkReturn @@ -153,51 +159,43 @@ checkReturn if [ -d /lib/modules ] then echo -e -n " ${BOLD}${BLUE}*${NORM} Loading modules... " - # squashfs support - modprobe squashfs - # ISO9660 support - modprobe isofs - - # linux filesystems support - modprobe ext2 - modprobe ext3 - modprobe reiserfs - modprobe xfs - modprobe jfs - - # dos/vfat filesystems support - modprobe vfat - modprobe msdos - - # IDE support - modprobe ide-core - - # general cdrom/disk support - modprobe cdrom - modprobe ide-cd_mod - modprobe ide-gd_mod - modprobe sr_mod - modprobe sd_mod - - # IDE - load_ide_modules() { - echo -e -n "${BOLD}${BLUE}IDE${NORM}" - for mod in aec62xx alim15x3 amd74xx atiixp \ - cmd64x cs5520 cs5530 cs5535 ide-pci-generic hpt366 it8213 \ - it821x jmicron ns87415 opti621 pdc202xx_new piix rz1000 sc1200 \ - serverworks siimage sis5513 slc90e66 tc86c001 triflex trm290 \ - via82cxxx + # filesystem + load_fs_modules() { + # no notification for fs modules since they're generic + #echo -e -n "${BOLD}${BLUE}File Systems${NORM}" + for mod in squashfs isofs ext2 ext3 reiserfs xfs jfs vfat msdos do + if [ ! -z "$DEBUG" ] + then + echo -n " $mod" + fi modprobe $mod done - echo -n ", " + #echo -n ", " + } + + # cdrom + load_cdrom_modules() { + # no notification for cdrom modules since they're generic + #echo -e -n "${BOLD}${BLUE}CDROM${NORM}" + # there's only one cdrom module for now but the loop allows for adding + # more if ever needed + for mod in cdrom + do + if [ ! -z "$DEBUG" ] + then + echo -n " $mod" + fi + modprobe $mod + done + #echo -n ", " } # SCSI load_scsi_modules() { echo -e -n "${BOLD}${BLUE}SCSI${NORM}" - for mod in scsi_transport_fc scsi_transport_iscsi scsi_transport_sas \ + for mod in sr_mod sd_mod scsi_transport_fc scsi_transport_iscsi scsi_transport_sas \ scsi_transport_spi 3w-9xxx 3w-xxxx 53c700 BusLogic NCR53c406a a100u2w \ aacraid advansys aha152x aha1542 aha1740 aic79xx aic7xxx aic94xx arcmsr \ atp870u dc395x dmx3191d dpt_i2o dtc eata fdomain gdth hptiop in2000 \ @@ -206,6 +204,10 @@ then sim710 stex sym53c416 sym53c8xx t128 tmscsim u14-34f ultrastor \ wd7000 mptsas mptspi do + if [ ! -z "$DEBUG" ] + then + echo -n " $mod" + fi modprobe $mod > /dev/null 2>&1 done echo -n ", " @@ -216,17 +218,35 @@ then echo -e -n "${BOLD}${BLUE}USB${NORM}" for mod in ehci-hcd ohci-hcd uhci-hcd sl811-hcd usb-storage usbhid do + if [ ! -z "$DEBUG" ] + then + echo -n " $mod" + fi modprobe $mod done echo -n ", " } - # SATA - load_sata_modules() { - echo -e -n "${BOLD}${BLUE}SATA${NORM}" - for mod in libata ata_piix sata_promise sata_sil sata_svw sata_via sata_nv \ - sata_sx4 sata_sis sata_uli sata_qstor ahci + # ATA + load_ata_modules() { + echo -e -n "${BOLD}${BLUE}ATA${NORM}" + for mod in libata libahci ahci sata_promise sata_sil sata_svw sata_via \ + sata_mv sata_nv sata_sil24 sata_sx4 sata_sis sata_uli \ + sata_vsc sata_qstor sata_inic162x ata_piix pata_mpiix \ + pata_pdc2027x pata_radisys pata_sil680 pata_rz1000 pata_cmd640 \ + pata_efar pata_cmd64x pata_hpt366 pata_hpt37x pata_hpt3x3 \ + pata_opti pata_optidma pata_it8213 pata_ninja32 pata_it821x \ + pata_artop pata_cypress pata_serverworks pata_ns87410 \ + pata_ns87415 pata_ali pata_amd pdc_adma ata_generic \ + pata_atiixp pata_triflex pata_sc1200 \ + pata_netcell pata_sch pata_sis pata_hpt3x2n pata_marvell \ + pata_jmicron pata_via pata_cs5520 pata_cs5530 pata_cs5535 \ + pata_cs5536 pata_sl82c105 do + if [ ! -z "$DEBUG" ] + then + echo -n " $mod" + fi modprobe $mod done echo -n ", " @@ -237,21 +257,16 @@ then echo -e -n "${BOLD}${BLUE}FireWire${NORM}" for mod in core ohci sbp2 do + if [ ! -z "$DEBUG" ] + then + echo -n " $mod" + fi modprobe firewire-$mod done echo -n ", " } - grep -q "libata" /proc/cmdline - C1=$? - grep -q "sata" /proc/cmdline - C2=$? - if [ $C1 -eq 0 -o $C2 -eq 0 ] - then - MODORDER="sata ide scsi usb firewire" - else - MODORDER="ide sata scsi usb firewire" - fi + MODORDER="fs cdrom ata scsi usb firewire" for MODS in $MODORDER do diff --git a/initramfs/initramfs.lst b/initramfs/initramfs.lst index e7a573e..0dd57bd 100644 --- a/initramfs/initramfs.lst +++ b/initramfs/initramfs.lst @@ -17,7 +17,7 @@ slink /bin/mount busybox 777 0 0 slink /bin/umount busybox 777 0 0 slink /bin/chroot busybox 777 0 0 slink /bin/grep busybox 777 0 0 -slink /bin/sed busybox 777 0 0 +slink /bin/awk busybox 777 0 0 slink /bin/echo busybox 777 0 0 slink /bin/cut busybox 777 0 0 slink /bin/mkdir busybox 777 0 0 @@ -56,8 +56,6 @@ dir /lib/modules/#KERNEL_VERSION#/kernel/drivers/usb/serial 755 0 0 dir /lib/modules/#KERNEL_VERSION#/kernel/drivers/usb/storage 755 0 0 dir /lib/modules/#KERNEL_VERSION#/kernel/drivers/firewire 755 0 0 dir /lib/modules/#KERNEL_VERSION#/kernel/drivers/ata 755 0 0 -dir /lib/modules/#KERNEL_VERSION#/kernel/drivers/ide 755 0 0 -dir /lib/modules/#KERNEL_VERSION#/kernel/drivers/ide/legacy 755 0 0 dir /lib/modules/#KERNEL_VERSION#/kernel/drivers/scsi 755 0 0 dir /lib/modules/#KERNEL_VERSION#/kernel/drivers/scsi/aacraid 755 0 0 dir /lib/modules/#KERNEL_VERSION#/kernel/drivers/scsi/aic7xxx 755 0 0 @@ -103,28 +101,45 @@ file /lib/modules/#KERNEL_VERSION#/kernel/drivers/hid/hid.ko ../kernel/linux-#KE file /lib/modules/#KERNEL_VERSION#/kernel/drivers/firewire/firewire-core.ko ../kernel/linux-#KERNEL_VERSION#/drivers/firewire/firewire-core.ko 644 0 0 file /lib/modules/#KERNEL_VERSION#/kernel/drivers/firewire/firewire-ohci.ko ../kernel/linux-#KERNEL_VERSION#/drivers/firewire/firewire-ohci.ko 644 0 0 file /lib/modules/#KERNEL_VERSION#/kernel/drivers/firewire/firewire-sbp2.ko ../kernel/linux-#KERNEL_VERSION#/drivers/firewire/firewire-sbp2.ko 644 0 0 +file /lib/modules/#KERNEL_VERSION#/kernel/drivers/ata/libahci.ko ../kernel/linux-#KERNEL_VERSION#/drivers/ata/libahci.ko 644 0 0 file /lib/modules/#KERNEL_VERSION#/kernel/drivers/ata/ahci.ko ../kernel/linux-#KERNEL_VERSION#/drivers/ata/ahci.ko 644 0 0 file /lib/modules/#KERNEL_VERSION#/kernel/drivers/ata/ata_generic.ko ../kernel/linux-#KERNEL_VERSION#/drivers/ata/ata_generic.ko 644 0 0 file /lib/modules/#KERNEL_VERSION#/kernel/drivers/ata/ata_piix.ko ../kernel/linux-#KERNEL_VERSION#/drivers/ata/ata_piix.ko 644 0 0 file /lib/modules/#KERNEL_VERSION#/kernel/drivers/ata/libata.ko ../kernel/linux-#KERNEL_VERSION#/drivers/ata/libata.ko 644 0 0 +file /lib/modules/#KERNEL_VERSION#/kernel/drivers/ata/pata_ali.ko ../kernel/linux-#KERNEL_VERSION#/drivers/ata/pata_ali.ko 644 0 0 file /lib/modules/#KERNEL_VERSION#/kernel/drivers/ata/pata_amd.ko ../kernel/linux-#KERNEL_VERSION#/drivers/ata/pata_amd.ko 644 0 0 file /lib/modules/#KERNEL_VERSION#/kernel/drivers/ata/pata_artop.ko ../kernel/linux-#KERNEL_VERSION#/drivers/ata/pata_artop.ko 644 0 0 file /lib/modules/#KERNEL_VERSION#/kernel/drivers/ata/pata_atiixp.ko ../kernel/linux-#KERNEL_VERSION#/drivers/ata/pata_atiixp.ko 644 0 0 +file /lib/modules/#KERNEL_VERSION#/kernel/drivers/ata/pata_cmd640.ko ../kernel/linux-#KERNEL_VERSION#/drivers/ata/pata_cmd640.ko 644 0 0 file /lib/modules/#KERNEL_VERSION#/kernel/drivers/ata/pata_cmd64x.ko ../kernel/linux-#KERNEL_VERSION#/drivers/ata/pata_cmd64x.ko 644 0 0 file /lib/modules/#KERNEL_VERSION#/kernel/drivers/ata/pata_cs5520.ko ../kernel/linux-#KERNEL_VERSION#/drivers/ata/pata_cs5520.ko 644 0 0 +file /lib/modules/#KERNEL_VERSION#/kernel/drivers/ata/pata_cs5530.ko ../kernel/linux-#KERNEL_VERSION#/drivers/ata/pata_cs5530.ko 644 0 0 +file /lib/modules/#KERNEL_VERSION#/kernel/drivers/ata/pata_cs5535.ko ../kernel/linux-#KERNEL_VERSION#/drivers/ata/pata_cs5535.ko 644 0 0 +file /lib/modules/#KERNEL_VERSION#/kernel/drivers/ata/pata_cs5536.ko ../kernel/linux-#KERNEL_VERSION#/drivers/ata/pata_cs5536.ko 644 0 0 +file /lib/modules/#KERNEL_VERSION#/kernel/drivers/ata/pata_cypress.ko ../kernel/linux-#KERNEL_VERSION#/drivers/ata/pata_cypress.ko 644 0 0 file /lib/modules/#KERNEL_VERSION#/kernel/drivers/ata/pata_efar.ko ../kernel/linux-#KERNEL_VERSION#/drivers/ata/pata_efar.ko 644 0 0 file /lib/modules/#KERNEL_VERSION#/kernel/drivers/ata/pata_hpt366.ko ../kernel/linux-#KERNEL_VERSION#/drivers/ata/pata_hpt366.ko 644 0 0 +file /lib/modules/#KERNEL_VERSION#/kernel/drivers/ata/pata_hpt37x.ko ../kernel/linux-#KERNEL_VERSION#/drivers/ata/pata_hpt37x.ko 644 0 0 +file /lib/modules/#KERNEL_VERSION#/kernel/drivers/ata/pata_hpt3x2n.ko ../kernel/linux-#KERNEL_VERSION#/drivers/ata/pata_hpt3x2n.ko 644 0 0 file /lib/modules/#KERNEL_VERSION#/kernel/drivers/ata/pata_hpt3x3.ko ../kernel/linux-#KERNEL_VERSION#/drivers/ata/pata_hpt3x3.ko 644 0 0 +file /lib/modules/#KERNEL_VERSION#/kernel/drivers/ata/pata_it8213.ko ../kernel/linux-#KERNEL_VERSION#/drivers/ata/pata_it8213.ko 644 0 0 file /lib/modules/#KERNEL_VERSION#/kernel/drivers/ata/pata_it821x.ko ../kernel/linux-#KERNEL_VERSION#/drivers/ata/pata_it821x.ko 644 0 0 file /lib/modules/#KERNEL_VERSION#/kernel/drivers/ata/pata_jmicron.ko ../kernel/linux-#KERNEL_VERSION#/drivers/ata/pata_jmicron.ko 644 0 0 file /lib/modules/#KERNEL_VERSION#/kernel/drivers/ata/pata_marvell.ko ../kernel/linux-#KERNEL_VERSION#/drivers/ata/pata_marvell.ko 644 0 0 file /lib/modules/#KERNEL_VERSION#/kernel/drivers/ata/pata_mpiix.ko ../kernel/linux-#KERNEL_VERSION#/drivers/ata/pata_mpiix.ko 644 0 0 +file /lib/modules/#KERNEL_VERSION#/kernel/drivers/ata/pata_ninja32.ko ../kernel/linux-#KERNEL_VERSION#/drivers/ata/pata_ninja32.ko 644 0 0 +file /lib/modules/#KERNEL_VERSION#/kernel/drivers/ata/pata_netcell.ko ../kernel/linux-#KERNEL_VERSION#/drivers/ata/pata_netcell.ko 644 0 0 +file /lib/modules/#KERNEL_VERSION#/kernel/drivers/ata/pata_ns87410.ko ../kernel/linux-#KERNEL_VERSION#/drivers/ata/pata_ns87410.ko 644 0 0 +file /lib/modules/#KERNEL_VERSION#/kernel/drivers/ata/pata_ns87415.ko ../kernel/linux-#KERNEL_VERSION#/drivers/ata/pata_ns87415.ko 644 0 0 file /lib/modules/#KERNEL_VERSION#/kernel/drivers/ata/pata_netcell.ko ../kernel/linux-#KERNEL_VERSION#/drivers/ata/pata_netcell.ko 644 0 0 file /lib/modules/#KERNEL_VERSION#/kernel/drivers/ata/pata_oldpiix.ko ../kernel/linux-#KERNEL_VERSION#/drivers/ata/pata_oldpiix.ko 644 0 0 +file /lib/modules/#KERNEL_VERSION#/kernel/drivers/ata/pata_opti.ko ../kernel/linux-#KERNEL_VERSION#/drivers/ata/pata_opti.ko 644 0 0 +file /lib/modules/#KERNEL_VERSION#/kernel/drivers/ata/pata_optidma.ko ../kernel/linux-#KERNEL_VERSION#/drivers/ata/pata_optidma.ko 644 0 0 file /lib/modules/#KERNEL_VERSION#/kernel/drivers/ata/pata_pcmcia.ko ../kernel/linux-#KERNEL_VERSION#/drivers/ata/pata_pcmcia.ko 644 0 0 file /lib/modules/#KERNEL_VERSION#/kernel/drivers/ata/pata_pdc2027x.ko ../kernel/linux-#KERNEL_VERSION#/drivers/ata/pata_pdc2027x.ko 644 0 0 -file /lib/modules/#KERNEL_VERSION#/kernel/drivers/ata/pata_qdi.ko ../kernel/linux-#KERNEL_VERSION#/drivers/ata/pata_qdi.ko 644 0 0 +file /lib/modules/#KERNEL_VERSION#/kernel/drivers/ata/pata_radisys.ko ../kernel/linux-#KERNEL_VERSION#/drivers/ata/pata_radisys.ko 644 0 0 file /lib/modules/#KERNEL_VERSION#/kernel/drivers/ata/pata_rz1000.ko ../kernel/linux-#KERNEL_VERSION#/drivers/ata/pata_rz1000.ko 644 0 0 +file /lib/modules/#KERNEL_VERSION#/kernel/drivers/ata/pata_sc1200.ko ../kernel/linux-#KERNEL_VERSION#/drivers/ata/pata_sc1200.ko 644 0 0 file /lib/modules/#KERNEL_VERSION#/kernel/drivers/ata/pata_sch.ko ../kernel/linux-#KERNEL_VERSION#/drivers/ata/pata_sch.ko 644 0 0 file /lib/modules/#KERNEL_VERSION#/kernel/drivers/ata/pata_serverworks.ko ../kernel/linux-#KERNEL_VERSION#/drivers/ata/pata_serverworks.ko 644 0 0 file /lib/modules/#KERNEL_VERSION#/kernel/drivers/ata/pata_sil680.ko ../kernel/linux-#KERNEL_VERSION#/drivers/ata/pata_sil680.ko 644 0 0 @@ -132,6 +147,7 @@ file /lib/modules/#KERNEL_VERSION#/kernel/drivers/ata/pata_sis.ko ../kernel/linu file /lib/modules/#KERNEL_VERSION#/kernel/drivers/ata/pata_sl82c105.ko ../kernel/linux-#KERNEL_VERSION#/drivers/ata/pata_sl82c105.ko 644 0 0 file /lib/modules/#KERNEL_VERSION#/kernel/drivers/ata/pata_triflex.ko ../kernel/linux-#KERNEL_VERSION#/drivers/ata/pata_triflex.ko 644 0 0 file /lib/modules/#KERNEL_VERSION#/kernel/drivers/ata/pata_via.ko ../kernel/linux-#KERNEL_VERSION#/drivers/ata/pata_via.ko 644 0 0 +file /lib/modules/#KERNEL_VERSION#/kernel/drivers/ata/pata_winbond.ko ../kernel/linux-#KERNEL_VERSION#/drivers/ata/pata_winbond.ko 644 0 0 file /lib/modules/#KERNEL_VERSION#/kernel/drivers/ata/pdc_adma.ko ../kernel/linux-#KERNEL_VERSION#/drivers/ata/pdc_adma.ko 644 0 0 file /lib/modules/#KERNEL_VERSION#/kernel/drivers/ata/sata_inic162x.ko ../kernel/linux-#KERNEL_VERSION#/drivers/ata/sata_inic162x.ko 644 0 0 file /lib/modules/#KERNEL_VERSION#/kernel/drivers/ata/sata_mv.ko ../kernel/linux-#KERNEL_VERSION#/drivers/ata/sata_mv.ko 644 0 0 @@ -146,42 +162,6 @@ file /lib/modules/#KERNEL_VERSION#/kernel/drivers/ata/sata_sx4.ko ../kernel/linu file /lib/modules/#KERNEL_VERSION#/kernel/drivers/ata/sata_uli.ko ../kernel/linux-#KERNEL_VERSION#/drivers/ata/sata_uli.ko 644 0 0 file /lib/modules/#KERNEL_VERSION#/kernel/drivers/ata/sata_via.ko ../kernel/linux-#KERNEL_VERSION#/drivers/ata/sata_via.ko 644 0 0 file /lib/modules/#KERNEL_VERSION#/kernel/drivers/ata/sata_vsc.ko ../kernel/linux-#KERNEL_VERSION#/drivers/ata/sata_vsc.ko 644 0 0 -file /lib/modules/#KERNEL_VERSION#/kernel/drivers/ide/ide-cd_mod.ko ../kernel/linux-#KERNEL_VERSION#/drivers/ide/ide-cd_mod.ko 644 0 0 -file /lib/modules/#KERNEL_VERSION#/kernel/drivers/ide/ide-core.ko ../kernel/linux-#KERNEL_VERSION#/drivers/ide/ide-core.ko 644 0 0 -file /lib/modules/#KERNEL_VERSION#/kernel/drivers/ide/ide-gd_mod.ko ../kernel/linux-#KERNEL_VERSION#/drivers/ide/ide-gd_mod.ko 644 0 0 -file /lib/modules/#KERNEL_VERSION#/kernel/drivers/ide/ide-pnp.ko ../kernel/linux-#KERNEL_VERSION#/drivers/ide/ide-pnp.ko 644 0 0 -file /lib/modules/#KERNEL_VERSION#/kernel/drivers/ide/ide-tape.ko ../kernel/linux-#KERNEL_VERSION#/drivers/ide/ide-tape.ko 644 0 0 -file /lib/modules/#KERNEL_VERSION#/kernel/drivers/ide/ide-cs.ko ../kernel/linux-#KERNEL_VERSION#/drivers/ide/ide-cs.ko 644 0 0 -file /lib/modules/#KERNEL_VERSION#/kernel/drivers/ide/aec62xx.ko ../kernel/linux-#KERNEL_VERSION#/drivers/ide/aec62xx.ko 644 0 0 -file /lib/modules/#KERNEL_VERSION#/kernel/drivers/ide/alim15x3.ko ../kernel/linux-#KERNEL_VERSION#/drivers/ide/alim15x3.ko 644 0 0 -file /lib/modules/#KERNEL_VERSION#/kernel/drivers/ide/amd74xx.ko ../kernel/linux-#KERNEL_VERSION#/drivers/ide/amd74xx.ko 644 0 0 -file /lib/modules/#KERNEL_VERSION#/kernel/drivers/ide/atiixp.ko ../kernel/linux-#KERNEL_VERSION#/drivers/ide/atiixp.ko 644 0 0 -file /lib/modules/#KERNEL_VERSION#/kernel/drivers/ide/cmd640.ko ../kernel/linux-#KERNEL_VERSION#/drivers/ide/cmd640.ko 644 0 0 -file /lib/modules/#KERNEL_VERSION#/kernel/drivers/ide/cmd64x.ko ../kernel/linux-#KERNEL_VERSION#/drivers/ide/cmd64x.ko 644 0 0 -file /lib/modules/#KERNEL_VERSION#/kernel/drivers/ide/cs5520.ko ../kernel/linux-#KERNEL_VERSION#/drivers/ide/cs5520.ko 644 0 0 -file /lib/modules/#KERNEL_VERSION#/kernel/drivers/ide/cs5530.ko ../kernel/linux-#KERNEL_VERSION#/drivers/ide/cs5530.ko 644 0 0 -file /lib/modules/#KERNEL_VERSION#/kernel/drivers/ide/cs5535.ko ../kernel/linux-#KERNEL_VERSION#/drivers/ide/cs5535.ko 644 0 0 -file /lib/modules/#KERNEL_VERSION#/kernel/drivers/ide/delkin_cb.ko ../kernel/linux-#KERNEL_VERSION#/drivers/ide/delkin_cb.ko 644 0 0 -file /lib/modules/#KERNEL_VERSION#/kernel/drivers/ide/hpt366.ko ../kernel/linux-#KERNEL_VERSION#/drivers/ide/hpt366.ko 644 0 0 -file /lib/modules/#KERNEL_VERSION#/kernel/drivers/ide/ide-pci-generic.ko ../kernel/linux-#KERNEL_VERSION#/drivers/ide/ide-pci-generic.ko 644 0 0 -file /lib/modules/#KERNEL_VERSION#/kernel/drivers/ide/it8213.ko ../kernel/linux-#KERNEL_VERSION#/drivers/ide/it8213.ko 644 0 0 -file /lib/modules/#KERNEL_VERSION#/kernel/drivers/ide/it821x.ko ../kernel/linux-#KERNEL_VERSION#/drivers/ide/it821x.ko 644 0 0 -file /lib/modules/#KERNEL_VERSION#/kernel/drivers/ide/jmicron.ko ../kernel/linux-#KERNEL_VERSION#/drivers/ide/jmicron.ko 644 0 0 -file /lib/modules/#KERNEL_VERSION#/kernel/drivers/ide/ns87415.ko ../kernel/linux-#KERNEL_VERSION#/drivers/ide/ns87415.ko 644 0 0 -file /lib/modules/#KERNEL_VERSION#/kernel/drivers/ide/opti621.ko ../kernel/linux-#KERNEL_VERSION#/drivers/ide/opti621.ko 644 0 0 -file /lib/modules/#KERNEL_VERSION#/kernel/drivers/ide/pdc202xx_new.ko ../kernel/linux-#KERNEL_VERSION#/drivers/ide/pdc202xx_new.ko 644 0 0 -file /lib/modules/#KERNEL_VERSION#/kernel/drivers/ide/pdc202xx_old.ko ../kernel/linux-#KERNEL_VERSION#/drivers/ide/pdc202xx_old.ko 644 0 0 -file /lib/modules/#KERNEL_VERSION#/kernel/drivers/ide/piix.ko ../kernel/linux-#KERNEL_VERSION#/drivers/ide/piix.ko 644 0 0 -file /lib/modules/#KERNEL_VERSION#/kernel/drivers/ide/rz1000.ko ../kernel/linux-#KERNEL_VERSION#/drivers/ide/rz1000.ko 644 0 0 -file /lib/modules/#KERNEL_VERSION#/kernel/drivers/ide/sc1200.ko ../kernel/linux-#KERNEL_VERSION#/drivers/ide/sc1200.ko 644 0 0 -file /lib/modules/#KERNEL_VERSION#/kernel/drivers/ide/serverworks.ko ../kernel/linux-#KERNEL_VERSION#/drivers/ide/serverworks.ko 644 0 0 -file /lib/modules/#KERNEL_VERSION#/kernel/drivers/ide/siimage.ko ../kernel/linux-#KERNEL_VERSION#/drivers/ide/siimage.ko 644 0 0 -file /lib/modules/#KERNEL_VERSION#/kernel/drivers/ide/sis5513.ko ../kernel/linux-#KERNEL_VERSION#/drivers/ide/sis5513.ko 644 0 0 -file /lib/modules/#KERNEL_VERSION#/kernel/drivers/ide/slc90e66.ko ../kernel/linux-#KERNEL_VERSION#/drivers/ide/slc90e66.ko 644 0 0 -file /lib/modules/#KERNEL_VERSION#/kernel/drivers/ide/tc86c001.ko ../kernel/linux-#KERNEL_VERSION#/drivers/ide/tc86c001.ko 644 0 0 -file /lib/modules/#KERNEL_VERSION#/kernel/drivers/ide/triflex.ko ../kernel/linux-#KERNEL_VERSION#/drivers/ide/triflex.ko 644 0 0 -file /lib/modules/#KERNEL_VERSION#/kernel/drivers/ide/trm290.ko ../kernel/linux-#KERNEL_VERSION#/drivers/ide/trm290.ko 644 0 0 -file /lib/modules/#KERNEL_VERSION#/kernel/drivers/ide/via82cxxx.ko ../kernel/linux-#KERNEL_VERSION#/drivers/ide/via82cxxx.ko 644 0 0 file /lib/modules/#KERNEL_VERSION#/kernel/drivers/scsi/3w-9xxx.ko ../kernel/linux-#KERNEL_VERSION#/drivers/scsi/3w-9xxx.ko 644 0 0 file /lib/modules/#KERNEL_VERSION#/kernel/drivers/scsi/3w-xxxx.ko ../kernel/linux-#KERNEL_VERSION#/drivers/scsi/3w-xxxx.ko 644 0 0 file /lib/modules/#KERNEL_VERSION#/kernel/drivers/scsi/BusLogic.ko ../kernel/linux-#KERNEL_VERSION#/drivers/scsi/BusLogic.ko 644 0 0 diff --git a/iso/isolinux/modules.msg b/iso/isolinux/modules.msg index 16c3d4f..eba848d 100644 --- a/iso/isolinux/modules.msg +++ b/iso/isolinux/modules.msg @@ -3,18 +3,10 @@ Module options: (Note: separate with spaces when specifying multiple options) - noide, noscsi, These options disable loading of the the corresponding - nosata, nousb, kernel modules. For example, "CRUX noide" will skip the - nofirewire IDE modules when loading modules to find the cdrom. Any - combination of these options can be specified but keep + noscsi, noata, These options disable loading of the the corresponding + nofirewire, kernel modules. For example, "CRUX noata" will skip the + nousb, nofs, ATA modules when loading modules to find the cdrom. Any + nocdrom combination of these options can be specified but keep in mind that specifying them all or just the ones that exclude your hardware won't yield useful results! - libata, sata These options are equivalent and cause the module loading - portion of the boot sequence to load the SATA modules - before the IDE modules. In some cases this won't cause - any change but in the case of a controller that's - supported by both IDE and SATA drivers (Intel PIIX, etc.) - will use libata instead of IDE. Note that disk/cdrom - devices will be sdX/srY in this case. - diff --git a/kernel/linux-2.6.35.4.config b/kernel/linux-2.6.35.4.config index 68f80ea..08e140c 100644 --- a/kernel/linux-2.6.35.4.config +++ b/kernel/linux-2.6.35.4.config @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.35.4 -# Tue Sep 7 20:31:03 2010 +# Thu Sep 16 15:52:15 2010 # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -616,87 +616,7 @@ CONFIG_ATA_OVER_ETH=m # CONFIG_MISC_DEVICES is not set CONFIG_EEPROM_93CX6=m CONFIG_HAVE_IDE=y -CONFIG_IDE=m - -# -# Please see Documentation/ide/ide.txt for help/info on IDE drives -# -CONFIG_IDE_XFER_MODE=y -CONFIG_IDE_TIMINGS=y -CONFIG_IDE_ATAPI=y -# CONFIG_BLK_DEV_IDE_SATA is not set -CONFIG_IDE_GD=m -CONFIG_IDE_GD_ATA=y -CONFIG_IDE_GD_ATAPI=y -CONFIG_BLK_DEV_IDECS=m -CONFIG_BLK_DEV_DELKIN=m -CONFIG_BLK_DEV_IDECD=m -CONFIG_BLK_DEV_IDECD_VERBOSE_ERRORS=y -CONFIG_BLK_DEV_IDETAPE=m -# CONFIG_IDE_TASK_IOCTL is not set -CONFIG_IDE_PROC_FS=y - -# -# IDE chipset support/bugfixes -# -CONFIG_IDE_GENERIC=m -# CONFIG_BLK_DEV_PLATFORM is not set -CONFIG_BLK_DEV_CMD640=m -CONFIG_BLK_DEV_CMD640_ENHANCED=y -CONFIG_BLK_DEV_IDEPNP=m -CONFIG_BLK_DEV_IDEDMA_SFF=y - -# -# PCI IDE chipsets support -# -CONFIG_BLK_DEV_IDEPCI=y -# CONFIG_BLK_DEV_OFFBOARD is not set -CONFIG_BLK_DEV_GENERIC=m -CONFIG_BLK_DEV_OPTI621=m -CONFIG_BLK_DEV_RZ1000=m -CONFIG_BLK_DEV_IDEDMA_PCI=y -CONFIG_BLK_DEV_AEC62XX=m -CONFIG_BLK_DEV_ALI15X3=m -CONFIG_BLK_DEV_AMD74XX=m -CONFIG_BLK_DEV_ATIIXP=m -CONFIG_BLK_DEV_CMD64X=m -CONFIG_BLK_DEV_TRIFLEX=m -CONFIG_BLK_DEV_CS5520=m -CONFIG_BLK_DEV_CS5530=m -CONFIG_BLK_DEV_CS5535=m -CONFIG_BLK_DEV_CS5536=m -CONFIG_BLK_DEV_HPT366=m -CONFIG_BLK_DEV_JMICRON=m -CONFIG_BLK_DEV_SC1200=m -CONFIG_BLK_DEV_PIIX=m -CONFIG_BLK_DEV_IT8172=m -CONFIG_BLK_DEV_IT8213=m -CONFIG_BLK_DEV_IT821X=m -CONFIG_BLK_DEV_NS87415=m -CONFIG_BLK_DEV_PDC202XX_OLD=m -CONFIG_BLK_DEV_PDC202XX_NEW=m -CONFIG_BLK_DEV_SVWKS=m -CONFIG_BLK_DEV_SIIMAGE=m -CONFIG_BLK_DEV_SIS5513=m -CONFIG_BLK_DEV_SLC90E66=m -CONFIG_BLK_DEV_TRM290=m -CONFIG_BLK_DEV_VIA82CXXX=m -CONFIG_BLK_DEV_TC86C001=m - -# -# Other IDE chipsets support -# - -# -# Note: most of these also require special kernel boot parameters -# -# CONFIG_BLK_DEV_4DRIVES is not set -# CONFIG_BLK_DEV_ALI14XX is not set -# CONFIG_BLK_DEV_DTC2278 is not set -# CONFIG_BLK_DEV_HT6560B is not set -# CONFIG_BLK_DEV_QD65XX is not set -# CONFIG_BLK_DEV_UMC8672 is not set -CONFIG_BLK_DEV_IDEDMA=y +# CONFIG_IDE is not set # # SCSI device support @@ -837,13 +757,13 @@ CONFIG_SCSI_NSP32=m CONFIG_ATA=m # CONFIG_ATA_NONSTANDARD is not set CONFIG_ATA_VERBOSE_ERROR=y -CONFIG_SATA_PMP=y +# CONFIG_SATA_PMP is not set # # Controllers with non-SFF native interface # CONFIG_SATA_AHCI=m -CONFIG_SATA_AHCI_PLATFORM=m +# CONFIG_SATA_AHCI_PLATFORM is not set CONFIG_SATA_INIC162X=m CONFIG_SATA_SIL24=m CONFIG_ATA_SFF=y @@ -1841,7 +1761,6 @@ CONFIG_LEDS_TRIGGERS=y # LED Triggers # # CONFIG_LEDS_TRIGGER_TIMER is not set -# CONFIG_LEDS_TRIGGER_IDE_DISK is not set # CONFIG_LEDS_TRIGGER_HEARTBEAT is not set # CONFIG_LEDS_TRIGGER_BACKLIGHT is not set # CONFIG_LEDS_TRIGGER_DEFAULT_ON is not set