r1872 - in trunk: . packages/initramfs packages/linux packages/linux64

alexander at linuxfromscratch.org alexander at linuxfromscratch.org
Sun May 6 05:15:00 PDT 2007


Author: alexander
Date: 2007-05-06 06:15:00 -0600 (Sun, 06 May 2007)
New Revision: 1872

Added:
   trunk/packages/initramfs/init.in
Removed:
   trunk/packages/initramfs/init.c
   trunk/packages/initramfs/init.h
   trunk/packages/initramfs/iso9660.h
Modified:
   trunk/Makefile
   trunk/packages/initramfs/Makefile
   trunk/packages/linux/config.x86
   trunk/packages/linux64/config.x86_64
Log:
Completely redesigned initramfs:

 * Written in bash, thus can be easily modified
 * Allows fully modular kernel, thus the boot can never break to irrelevant ISA driver that writes to ports blindly
 * Supports both old-style IDE and libata



Modified: trunk/Makefile
===================================================================
--- trunk/Makefile	2007-04-30 09:45:40 UTC (rev 1871)
+++ trunk/Makefile	2007-05-06 12:15:00 UTC (rev 1872)
@@ -270,32 +270,18 @@
 	ch-cpio ch-mutt ch-msmtp ch-tin ch-mdadm ch-which ch-BRLTTY  \
 	ch-strace ch-iptables ch-eject ch-xlockmore ch-hdparm ch-linux \
 	ch-sysfsutils ch-pcmcia-cs ch-pcmciautils ch-ddccontrol ch-ddccontrol-db \
-	ch-initramfs ch-blfs-bootscripts ch-oui-data \
+	ch-blfs-bootscripts ch-oui-data \
 	ch-man-fr ch-man-pages-es ch-man-pages-it ch-manpages-de ch-manpages-ru \
 	ch-anthy ch-scim ch-scim-tables ch-scim-anthy ch-libhangul ch-scim-hangul \
 	ch-libchewing ch-scim-chewing ch-scim-pinyin ch-scim-input-pad \
 	ch-hibernate-script ch-slang ch-mc \
 	ch-fuse ch-dosfstools ch-ntfsprogs \
 	ch-vbetool ch-bin86 ch-grub ch-lilo ch-syslinux \
-	ch-binutils64 ch-gcc64 ch-linux64
+	ch-binutils64 ch-gcc64 ch-linux64 ch-initramfs
 	# Proprietary drivers disabled - NVIDIA crashes, ATI is too fat
 	# make ch-gcc33 ch-proprietary-drivers
 	make update-caches
 
-blfs-minimal: ch-openssl ch-wget ch-reiserfsprogs ch-xfsprogs ch-nano ch-joe \
-	ch-screen ch-pkgconfig ch-libidn ch-curl ch-zip ch-unzip ch-lynx ch-libxml2 \
-	ch-expat ch-subversion ch-lfs-bootscripts ch-livecd-bootscripts ch-docbook-xml ch-libxslt \
-	ch-docbook-xsl ch-html_tidy ch-LFS-BOOK ch-openssh ch-glib2 ch-cvs \
-	ch-popt ch-samba ch-irssi ch-wireless_tools ch-tcpwrappers ch-portmap \
-	ch-nfs-utils ch-traceroute ch-rsync ch-jhalfs ch-sudo ch-dialog ch-ncftp \
-	ch-pciutils ch-device-mapper ch-LVM2 ch-dmraid \
-	ch-dhcpcd ch-distcc ch-ppp ch-rp-pppoe ch-libaal ch-reiser4progs \
-	ch-cpio ch-mutt ch-msmtp ch-tin ch-mdadm ch-which ch-BRLTTY \
-	ch-strace ch-iptables ch-eject ch-hdparm ch-linux \
-	ch-initramfs ch-blfs-bootscripts \
-	ch-man-fr ch-man-pages-es ch-man-pages-it ch-manpages-de ch-manpages-ru \
-	ch-bin86 ch-lilo ch-syslinux
-
 wget-list:
 	@>wget-list ; \
 	 for DIR in packages/* ; do \

Modified: trunk/packages/initramfs/Makefile
===================================================================
--- trunk/packages/initramfs/Makefile	2007-04-30 09:45:40 UTC (rev 1871)
+++ trunk/packages/initramfs/Makefile	2007-05-06 12:15:00 UTC (rev 1872)
@@ -1,10 +1,8 @@
 # Makefile for initramfs included on the LFS livecd
 
-NM= initramfs
+NM= initramfs-new
 VRS= 1
 
-MK= mknod
-CP= cp
 WDIR= temp
 
 # Targets
@@ -15,46 +13,37 @@
 	chroot "$(MP)" $(chenv-blfs) \
 	'cd $(ROOT) && make ch-$(NM) $(chbash-post-bash)'
 
-stage2: Makefile
+stage2: Makefile init.in
 	@make compile-$@
 	@make clean
 	@touch $@
 
-compile-stage2: init
-	mkdir -p $(WDIR)/{dev/mapper,bin,.tmpfs,.lfs-cd}
-	$(CP) init $(WDIR)/
-	$(MK) -m 640 $(WDIR)/dev/console c 5 1
-	$(MK) -m 660 $(WDIR)/dev/hda b 3 0
-	$(MK) -m 660 $(WDIR)/dev/hdb b 3 64
-	$(MK) -m 660 $(WDIR)/dev/hdc b 22 0
-	$(MK) -m 660 $(WDIR)/dev/hdd b 22 64
-	$(MK) -m 660 $(WDIR)/dev/hde b 33 0
-	$(MK) -m 660 $(WDIR)/dev/hdf b 33 64
-	$(MK) -m 660 $(WDIR)/dev/hdg b 34 0
-	$(MK) -m 660 $(WDIR)/dev/hdh b 34 64
-	$(MK) -m 664 $(WDIR)/dev/null c 1 3
-	$(MK) -m 660 $(WDIR)/dev/sr0 b 11 0
-	$(MK) -m 660 $(WDIR)/dev/sr1 b 11 1
-	$(MK) -m 660 $(WDIR)/dev/sr2 b 11 2
-	$(MK) -m 660 $(WDIR)/dev/sr3 b 11 3
-	$(MK) -m 660 $(WDIR)/dev/sr4 b 11 4
-	$(MK) -m 660 $(WDIR)/dev/sr5 b 11 5
-	$(MK) -m 660 $(WDIR)/dev/sr6 b 11 6
-	$(MK) -m 660 $(WDIR)/dev/sr7 b 11 7
-	$(MK) -m 660 $(WDIR)/dev/mapper/control c 10 63
-	$(MK) -m 660 $(WDIR)/dev/mapper/lfs-cd b 254 0
-	$(MK) -m 660 $(WDIR)/dev/loop0 b 7 0
-	$(MK) -m 660 $(WDIR)/dev/loop1 b 7 1
+compile-stage2:
+	mkdir -p $(WDIR)/{bin,dev,etc/udev/rules.d,lib,sbin,sys,proc}
+	cp /etc/udev/udev.conf $(WDIR)/etc/udev/udev.conf
+	cp /etc/udev/rules.d/{05-*,26-*,60-*} $(WDIR)/etc/udev/rules.d
+	sed s/@VERSION@/$(VERSION)/ init.in >$(WDIR)/init
+	chmod 755 $(WDIR)/init
+	mknod -m 640 $(WDIR)/dev/console c 5 1
+	mknod -m 664 $(WDIR)/dev/null c 1 3
+	cp /bin/{sh,dd,cat,cp,mkdir,mount,umount,sleep,ln,rm,uname} $(WDIR)/bin
+	cp /lib/{libblkid.so.1,libc.so.6,libdl.so.2,ld-linux.so.2} $(WDIR)/lib
+	cp /lib/{libncursesw.so.5,libreadline.so.5,libhistory.so.5} $(WDIR)/lib
+	cp /lib/{libpthread.so.0,librt.so.1,libuuid.so.1} $(WDIR)/lib
+	cp /usr/lib/libdevmapper.so.1.02 $(WDIR)/lib
+	cp -a /lib/udev $(WDIR)/lib
+	cp /sbin/{losetup,blockdev,udevd,udevtrigger,udevsettle,modprobe} $(WDIR)/sbin
+	cp /usr/sbin/dmsetup $(WDIR)/sbin
+	find /lib/modules/*/kernel/drivers/{ata,base,block,cdrom,ide,message,scsi,usb/{core,host,storage}} \
+	    /lib/modules/*/kernel/fs/{mbcache.ko,ext2,ext3,ext4,reiserfs,xfs,fat,vfat,ntfs,isofs,udf,nls} \
+	    /lib/modules/*/kernel/lib -type f | cpio --make-directories -p $(WDIR)
+	for a in /lib/modules/* ; do ver=$${a##*/} ; depmod -b $(WDIR) $$ver ; done
 	cd $(WDIR); find . | cpio -o -H newc | gzip -9 > ../initramfs_data.cpio.gz
-	$(CP) initramfs_data.cpio.gz /boot/isolinux/initramfs_data.cpio.gz
-	rm -rf temp
+	cp initramfs_data.cpio.gz /boot/isolinux/initramfs_data.cpio.gz
+	rm -rf $(WDIR)
 
-init:
-	gcc $@.c -o $@ -static -ldevmapper $(CFLAGS) -Wall -DVOLUME_ID=\"lfslivecd-$(VERSION)\" -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64
-
 clean:
-	-rm -rf temp
+	-rm -rf $(WDIR)
 	-rm -f initramfs_data*
-	-rm -f init
 
 .PHONY: clean chroot compile-stage2

Deleted: trunk/packages/initramfs/init.c
===================================================================
--- trunk/packages/initramfs/init.c	2007-04-30 09:45:40 UTC (rev 1871)
+++ trunk/packages/initramfs/init.c	2007-05-06 12:15:00 UTC (rev 1872)
@@ -1,272 +0,0 @@
-/*
-   Init for the Official LFS LiveCD
-   Written by Jeremy Huntwork, 2005-09-16
-
-   This code sets up a directory structure for the CD in the initramfs,
-   finds and mounts the LFS LiveCD, mounts the root file system via the
-   squashfs file, overlays it all with unionfs and finally passes
-   control over to sysvinit to finish the boot process.
-*/
-
-#include "init.h"
-
-
-/* Devices to check for the LFS CD, could scan some stuff in /proc in a later version */
-const char *devices[] = 
-{
-	"/dev/hda", "/dev/hdb", "/dev/hdc", "/dev/hdd", "/dev/hde", "/dev/hdf", "/dev/hdg", "/dev/hdh",
-	"/dev/sr0", "/dev/sr1", "/dev/sr2", "/dev/sr3", "/dev/sr4", "/dev/sr5", "/dev/sr6", "/dev/sr7",
-	NULL
-};
-
-const char *lfscd;
-
-int mountlfscd(void);
-
-int losetup(char * loop, char * file, int flags)
-{
-	struct loop_info loopinfo;
-	int fd, ffd;
-	
-	memset(&loopinfo, 0, sizeof(loopinfo));
-
-	ffd = open(file, flags);
-	if (ffd<0) {
-		printf("Failed to open the %s file: %s\n", file, strerror(errno));
-		return(0);
-	}
-	
-	fd = open(loop, flags);
-	if (fd<0) {
-		printf("Failed to open the loop device: %s\n", strerror(errno));
-		return(0);
-	}
-
-	snprintf(loopinfo.lo_name, LO_NAME_SIZE, "%s", file);
-
-	loopinfo.lo_offset = 0;
-	loopinfo.lo_encrypt_key_size = 0;
-	loopinfo.lo_encrypt_type = LO_CRYPT_NONE;
-
-	if(ioctl(fd, LOOP_SET_FD, ffd) < 0) {
-		printf("Failed to set up device: %s\n", strerror(errno));
-		return(0);
-	}
-	close(ffd);
-
-        if(ioctl(fd, LOOP_SET_STATUS, &loopinfo) < 0) {
-                printf("Failed to set up device: %s\n", strerror(errno));
-		(void) ioctl(fd, LOOP_CLR_FD, 0);
-		close(fd);
-                return(0);
-        }
-        close(fd);
-	return(1);
-}
-
-int main(int argc, char * argv[], char * envp[])
-{
-	int i, overhead;
-	int fd;
-	struct dm_task * dmt;
-	int devsize;
-	
-	printf("Initramfs activated\n");
-
-	mkdir("/proc", 0755);
-	mount("proc", "/proc", "proc", 0, 0);
-	
-	mkdir(TMPFS, 0755);
-	if (mount("tmpfs", TMPFS, "tmpfs", 0, "size=90%") < 0) {
-		printf("Failed to mount tmpfs: %s\n", strerror(errno));
-		return (0);
-	}
-	
-	mkdir(CDROM_MOUNT, 0755);
-
-	printf("Searching for the CD named %s...\n", VOLUME_ID);
-
-	for (i=0;i<MAX_RETRIES;i++)
-	{
-		if (mountlfscd())
-			break;
-
-		/* Failed to find any device with an LFS LiveCD */
-		printf("I couldn't find an LFS LiveCD in any drive!!\n");
-		printf("I'm going to wait 10 seconds and try again (Try %d/%d)\n", i, MAX_RETRIES);
-		sleep(10);
-	}
-
-	if (i>=MAX_RETRIES)
-	{
-		printf("I couldn't find an LFS LiveCD in any drive after %d retries!\n", MAX_RETRIES);
-		reboot(RB_POWER_OFF);
-		return(0);
-	}
-
-	/* If we're here, we have the LiveCD mounted and verifieid */
-	
-	/* Now, attempt to attach the root file to /dev/loop0 */
-
-	printf("Setting up the loopback devices...\n");
-	
-	losetup("/dev/loop0", ROOT_FILE, O_RDONLY);
-	
-	/* Create a sparse file for the second loop */
-	
-	fd = open("/dev/loop0", O_RDONLY);
-	ioctl(fd, BLKGETSIZE, &devsize);
-	close(fd);
-	
-	overhead = 0x1000 + devsize * 2;
-	
-	fd = open(OVERLAY, O_CREAT | O_WRONLY, 0600);
-	ftruncate(fd, devsize * 0x200ULL + overhead);
-	close(fd);
-	
-	losetup("/dev/loop1", OVERLAY, O_RDWR);
-	
-	/* Set up device-mapper */
-        dmt = dm_task_create(DM_DEVICE_CREATE);
-        dm_task_set_name(dmt, "lfs-cd");
-        dm_task_set_major(dmt, 254);
-        dm_task_set_minor(dmt, 0);
-        dm_task_add_target(dmt, 0, devsize,
-	    "snapshot", "/dev/loop0 /dev/loop1 p 8");
-        dm_task_run(dmt);
-        dm_task_destroy(dmt);
-							
-	printf("Mounting root filesystem...\n");
-	mkdir(ROOT, 0755);
-	i = mount("/dev/mapper/lfs-cd", ROOT, "ext2", 0, 0);
-	if (i<0) {
-		printf("Failed to mount root fs: %s\n", strerror(errno));
-		return(0);
-	}
-
-	/* Move the tmpfs to /dev/shm in the root fs */
-
-	mount("/.tmpfs", ROOT "/dev/shm", NULL, MS_MOVE, NULL);
-
-	/* Create a symlink for the CD drive to /dev/lfs-cd */
-
-	symlink(lfscd, ROOT "/dev/lfs-cd");
-
-
-	/* Remove the "/init" binary to free some RAM */
-	unlink ("/init");
-	umount2("/proc", 0);
-	
-	/* Chroot into the root fs */
-
-	chdir(ROOT);
-	mount(".", "/", NULL, MS_MOVE, NULL);
-
-	if ( chroot(".") || chdir("/") )
-		return(0);
-	
-	/* We're done! Pass control to sysvinit. */
-
-	printf("Starting init...\n");
-	
-	/* FIXME: file descriptors still point to initramfs */
-	execve("/sbin/init", argv, envp);
-	printf("Failed to start init: %s :(\n", strerror(errno));
-
-	return(0);
-}
-
-/* This will look for and mount the LFS LiveCD, if found/mounted it'll return 1, otherwise 0 */
-int mountlfscd(void)
-{
-	struct iso_primary_descriptor pd;
-	int i;
-	int correct_cd;
-
-	for(i=0;devices[i]!=NULL;i++)
-	{
-		int fd, status;
-		const char *curdevice = devices[i];
-		char buf[ISO_BLOCK_SIZE];
-
-		/* Try to open CD drive to see if we can use it */
-		fd = open(curdevice, O_RDONLY | O_NONBLOCK);
-		if (fd<0)
-		{
-			/*
-				We'll get here if we can't open the device
-				(No such device, No such file or directory, etc, etc)
-			
-			printf("%s: open failed: %s\n", curdevice, strerror(errno)); */
-			continue; /* On to the next device!! */
-		}
-
-		/* Try to see what the status of the CD drive is */
-		status = ioctl(fd, CDROM_DRIVE_STATUS, 0);
-		if (status<0)
-		{
-			/* We'll probably get here if we open a hard disk.
-			   No need to always print out this error. */
-			/* printf("%s: ioctl failed: %s\n", curdevice, strerror(errno)); */
-			close(fd);
-			continue; /* On to the next device!! */
-		} 
-
-		if (status != CDS_DISC_OK)
-		{
-			/* We'll probably get here if there's no CD in the drive */
-			printf("%s: Drive not ready\n", curdevice);
-			close(fd);
-			continue; /* On to the next device!! */
-		}
-
-		/* If we're here, the cd drive seems to have a disc in it, and is okay! 
-		   Now we'll try to match the Volume ID */
-
-		lseek(fd, ISO_PD_BLOCK*ISO_BLOCK_SIZE, SEEK_SET);
-
-		/* Read the ISO Block info and fill a struct with it */
-
-		read(fd, buf, ISO_BLOCK_SIZE);
-		memcpy( &pd, buf, sizeof(pd) );
-
-  		printf("%s: Volume ID is %s\n", curdevice, pd.volume_id);
-
-		/* close(fd); */
-
-		/* Compare the string in pd.volume_id with the VOLUME_ID
-		   generated by the livecd Makefiles */
-
-		correct_cd = strncmp(VOLUME_ID, pd.volume_id, strlen(VOLUME_ID));
-		if (correct_cd!=0) {
-			printf("This is not the correct CD. Moving on...\n");
-			close(fd);
-			continue;
-		}
-
-		/* Try to mount the cd drive*/
-		status = mount(curdevice, CDROM_MOUNT, CDROM_FSTYPE, MS_RDONLY, NULL);
-		if (status<0)
-		{
-			printf("%s: mount failed: %s\n", curdevice, strerror(errno));
-			close(fd);
-			continue; /* On to the next device!! */
-		} 
-
-		/* If we're here, we definitely have the LiveCD mounted at the mount point :) */
-
-
-		memset(buf, 0, 32); /* Clear buffer so we don't have to check read's status */
-		read(fd, buf, 10);
-		close(fd);
-
-		/* YAY! we have the LFS LiveCD mounted :) */
-		printf("%s: LFS LiveCD Verified\n", curdevice);
-		lfscd = curdevice;
-		return(1);
-	}
-
-	/* Nuts, can't find an LFS LiveCD anywhere */
-
-	return(0);
-}

Deleted: trunk/packages/initramfs/init.h
===================================================================
--- trunk/packages/initramfs/init.h	2007-04-30 09:45:40 UTC (rev 1871)
+++ trunk/packages/initramfs/init.h	2007-05-06 12:15:00 UTC (rev 1872)
@@ -1,29 +0,0 @@
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <fcntl.h>
-#include <unistd.h>
-#include <errno.h>
-#include <sys/mount.h>
-#include <sys/types.h>
-#include <sys/wait.h>
-#include <sys/stat.h>
-#include <sys/ioctl.h>
-#include <linux/loop.h>
-#include <linux/cdrom.h>
-#include <linux/fs.h>
-#include <sys/reboot.h>
-#include <libdevmapper.h>
-#include "iso9660.h"
-
-#define TMPFS		"/.tmpfs"		  	/* Mount point for tmpfs */
-#define CDROM_MOUNT	"/.tmpfs/.cdrom"		/* Mount point for CD */
-#define ROOT_FILE	"/.tmpfs/.cdrom/root.ext2"	/* Origin file for the root fs */
-#define ROOT		"/.root"			/* Mount point for the root fs */
-#define OVERLAY		"/.tmpfs/.overlay"		/* Full path to overlay */
-
-#define	ISO_BLOCK_SIZE	2048
-#define	ISO_PD_BLOCK	0x10
-
-#define CDROM_FSTYPE	"iso9660"           	/* Filesystem of CD */
-#define MAX_RETRIES	3                   	/* How many times to retry scanning for the CD */

Added: trunk/packages/initramfs/init.in
===================================================================
--- trunk/packages/initramfs/init.in	                        (rev 0)
+++ trunk/packages/initramfs/init.in	2007-05-06 12:15:00 UTC (rev 1872)
@@ -0,0 +1,189 @@
+#!/bin/sh
+
+EXPECTED_LABEL="lfslivecd- at VERSION@"
+EXPECTED_LABEL="$EXPECTED_LABEL                                "
+EXPECTED_LABEL=${EXPECTED_LABEL:0:32}
+PATA=0
+
+init=/sbin/init
+root=
+rootfstype=ext3,ext2,auto
+ro="ro"
+noresume=0
+resume=
+all_generic_ide=0
+
+find_cd() {
+	for SYS in /sys/block/hd* /sys/block/sr* ; do
+		[ ! -d "$SYS" ] && continue
+		[ -f "$SYS/media" ] && read MEDIA <"$SYS/media" [ "$MEDIA" != "cdrom" ] && continue
+		DEV=/dev/${SYS##*/}
+		LABEL=`dd if=$DEV bs=1 skip=32808 count=32 2>/dev/null`
+		[ "$LABEL" = "$EXPECTED_LABEL" ] && ln -s "$DEV" /dev/lfs-cd && break
+	done
+}
+
+do_resume() {
+	case "$resume" in
+	*:*)
+		echo "$resume" >/sys/power/resume
+		;;
+	/dev/*)
+		dev=${resume#/dev/}
+		if [ -f /sys/block/${dev%?}/${dev}/dev ] ; then
+			cat /sys/block/${dev%?}/${dev}/dev >/sys/power/resume
+		elif [ -f /sys/block/${dev}/dev ] ; then
+			cat /sys/block/${dev}/dev >/sys/power/resume
+		else
+			echo "Cannot resume from unknown device $dev"
+		fi
+		;;
+	esac
+}
+
+do_mount_cd() {
+	while [ ! -L /dev/lfs-cd ] ; do
+		find_cd
+		if [ ! -L /dev/lfs-cd ] ; then
+			echo ""
+			echo "LFS LiveCD could not find its device, perhaps due to"
+			echo "unsupported or undetected hardware. Or maybe this is"
+			echo "just a slow SCSI or USB controller that needs some time"
+			echo "to settle (workaround: add rootdelay=10 to the kernel"
+			echo "command line in the boot loader)."
+			echo ""
+			echo "Dropping you to a shell."
+			echo "Please load the needed modules and, optionally, make"
+			echo "/dev/lfs-cd a symlink pointing to the correct device."
+			echo ""
+			sh
+		fi
+	done
+	mkdir /.tmpfs
+	mount -n -t tmpfs -o size=90% tmpfs /.tmpfs
+	mkdir /.tmpfs/.cdrom
+	mount -n -t iso9660 -o ro /dev/lfs-cd /.tmpfs/.cdrom
+	/sbin/losetup /dev/loop0 /.tmpfs/.cdrom/root.ext2
+	SIZE=`/sbin/blockdev --getsize /dev/loop0`
+	OVERHEAD=$(( 0x1000 + $SIZE * 2 ))
+	OVLSIZE=$(( $SIZE + ( $OVERHEAD + 511 ) / 512 ))
+	dd if=/dev/null of=/.tmpfs/.overlay bs=512 seek=$OVLSIZE 2>/dev/null
+	/sbin/losetup /dev/loop1 /.tmpfs/.overlay
+	echo "0 $SIZE snapshot /dev/loop0 /dev/loop1 p 8" | /sbin/dmsetup create lfs-cd
+	mount -n -t ext2 /dev/mapper/lfs-cd /.root
+	mount -n --move /.tmpfs /.root/dev/shm
+	cp -a /dev/lfs-cd /.root/dev/lfs-cd
+	cat /etc/modprobe.conf >>/.root/etc/modprobe.conf
+}
+
+do_mount_root() {
+	mkdir /.root
+	[ -n "$rootflags" ] && rootflags="$rootflags,"
+	rootflags="$rootflags$ro"
+	case "$root" in
+	*:*)
+		( IFS=":" ; mknod /dev/root b $root )
+		mount -n -t "$rootfstype" -o "$rootflags" /dev/root /.root
+		;;
+	/dev/*)
+		mount -n -t "$rootfstype" -o "$rootflags" "$root" /.root
+		;;
+	"")
+		do_mount_cd
+		;;
+	esac
+}
+
+mount -n -t proc proc /proc
+mount -n -t sysfs sysfs /sys
+
+read -r cmdline </proc/cmdline
+
+( IFS="," ; for module in $blacklist ; do
+	echo "blacklist $module" >>/etc/modprobe.conf
+done )
+
+for param in $cmdline ; do
+	case $param in
+	*.*=*)
+		module=${param%%.*}
+		option=${param#*.}
+		echo "options $module $option" >>/etc/modprobe.conf
+		;;
+	pata)
+		PATA=1
+		;;
+	all_generic_ide)
+		all_generic_ide=1
+		;;
+	init=*)
+		init=${param#init=}
+		;;
+	root=*)
+		root=${param#root=}
+		;;
+	rootfstype=*)
+		rootfstype=${param#rootfstype=}
+		;;
+	ro)
+		ro="ro"
+		;;
+	rw)
+		ro="rw"
+		;;
+	noresume)
+		noresume=1
+		;;
+	resume=*)
+		resume=${param#resume=}
+		;;
+	esac
+done
+
+case "$PATA" in
+	0)
+		for driver in /lib/modules/`uname -r`/kernel/drivers/ata/pata-*.ko ; do
+			drv=${driver##*/}
+			drv=${drv%.ko}
+			echo "blacklist $drv" >>/etc/modprobe.conf
+		done
+		echo "blacklist ata-piix" >>/etc/modprobe.conf
+		;;
+	1)
+		for driver in /lib/modules/`uname -r`/kernel/drivers/ide/pci/*.ko ; do
+			drv=${driver##*/}
+			drv=${drv%.ko}
+			echo "blacklist $drv" >>/etc/modprobe.conf
+		done
+		echo "blacklist ide-cs" >>/etc/modprobe.conf
+		;;
+esac
+
+if [ "$all_generic_ide" = 1 ] ; then
+	echo "options generic all_generic_ide=1" >>/etc/modprobe.conf
+	echo "options ata-generic all_generic_ide=1" >>/etc/modprobe.conf
+fi
+
+/sbin/udevd &
+PIDOF_UDEVD=$!
+
+( IFS="," ; for module in $load ; do
+	/sbin/modprobe "$module"
+done )
+
+/sbin/udevtrigger
+/sbin/udevsettle
+if [ -n "$rootdelay" ] ; then sleep "$rootdelay" ; fi
+
+do_resume
+do_mount_root
+
+kill $PIDOF_UDEVD
+
+umount /sys
+umount /proc
+cd /.root
+# Clean up and free some memory
+rm -rf /bin /sbin /lib /sys /proc /dev /.tmpfs /init
+./lib/ld-linux.so.2 --library-path ./lib ./bin/mount -n --move . /
+exec ../lib/ld-linux.so.2 --library-path ./lib ./usr/sbin/chroot . /sbin/init "$@"

Deleted: trunk/packages/initramfs/iso9660.h
===================================================================
--- trunk/packages/initramfs/iso9660.h	2007-04-30 09:45:40 UTC (rev 1871)
+++ trunk/packages/initramfs/iso9660.h	2007-05-06 12:15:00 UTC (rev 1872)
@@ -1,158 +0,0 @@
-/*
- * Header file iso9660.h - assorted structure definitions and typecasts.
- * specific to iso9660 filesystem.
-
-   Written by Eric Youngdale (1993).
-
-   Copyright 1993 Yggdrasil Computing, Incorporated
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
-
-/*
- * 	$Id: iso9660.h,v 1.6 1999/10/28 00:55:50 solyga Exp $
- */
-
-#ifndef _ISOFS_FS_H
-#define _ISOFS_FS_H
-
-/*
- * The isofs filesystem constants/structures
- */
-
-/* This part borrowed from the bsd386 isofs */
-#define ISODCL(from, to) (to - from + 1)
-
-struct iso_volume_descriptor {
-	char type[ISODCL(1,1)]; /* 711 */
-	char id[ISODCL(2,6)];
-	char version[ISODCL(7,7)];
-	char data[ISODCL(8,2048)];
-};
-
-/* volume descriptor types */
-#define ISO_VD_PRIMARY       1
-#define ISO_VD_SUPPLEMENTARY 2     /* Used by Joliet */
-#define ISO_VD_END           255
-
-#define ISO_STANDARD_ID "CD001"
-
-#define EL_TORITO_ID "EL TORITO SPECIFICATION"
-#define EL_TORITO_ARCH_x86 0
-#define EL_TORITO_ARCH_PPC 1
-#define EL_TORITO_ARCH_MAC 2
-#define EL_TORITO_BOOTABLE 0x88
-#define EL_TORITO_MEDIA_NOEMUL 0
-#define EL_TORITO_MEDIA_12FLOP  1
-#define EL_TORITO_MEDIA_144FLOP 2
-#define EL_TORITO_MEDIA_288FLOP 3
-#define EL_TORITO_MEDIA_HD      4
-
-struct iso_primary_descriptor {
-	char type			[ISODCL (  1,   1)]; /* 711 */
-	char id				[ISODCL (  2,   6)];
-	char version			[ISODCL (  7,   7)]; /* 711 */
-	char unused1			[ISODCL (  8,   8)];
-	char system_id			[ISODCL (  9,  40)]; /* achars */
-	char volume_id			[ISODCL ( 41,  72)]; /* dchars */
-	char unused2			[ISODCL ( 73,  80)];
-	char volume_space_size		[ISODCL ( 81,  88)]; /* 733 */
-	char escape_sequences		[ISODCL ( 89, 120)];
-	char volume_set_size		[ISODCL (121, 124)]; /* 723 */
-	char volume_sequence_number	[ISODCL (125, 128)]; /* 723 */
-	char logical_block_size		[ISODCL (129, 132)]; /* 723 */
-	char path_table_size		[ISODCL (133, 140)]; /* 733 */
-	char type_l_path_table		[ISODCL (141, 144)]; /* 731 */
-	char opt_type_l_path_table	[ISODCL (145, 148)]; /* 731 */
-	char type_m_path_table		[ISODCL (149, 152)]; /* 732 */
-	char opt_type_m_path_table	[ISODCL (153, 156)]; /* 732 */
-	char root_directory_record	[ISODCL (157, 190)]; /* 9.1 */
-	char volume_set_id		[ISODCL (191, 318)]; /* dchars */
-	char publisher_id		[ISODCL (319, 446)]; /* achars */
-	char preparer_id		[ISODCL (447, 574)]; /* achars */
-	char application_id		[ISODCL (575, 702)]; /* achars */
-	char copyright_file_id		[ISODCL (703, 739)]; /* 7.5 dchars */
-	char abstract_file_id		[ISODCL (740, 776)]; /* 7.5 dchars */
-	char bibliographic_file_id	[ISODCL (777, 813)]; /* 7.5 dchars */
-	char creation_date		[ISODCL (814, 830)]; /* 8.4.26.1 */
-	char modification_date		[ISODCL (831, 847)]; /* 8.4.26.1 */
-	char expiration_date		[ISODCL (848, 864)]; /* 8.4.26.1 */
-	char effective_date		[ISODCL (865, 881)]; /* 8.4.26.1 */
-	char file_structure_version	[ISODCL (882, 882)]; /* 711 */
-	char unused4			[ISODCL (883, 883)];
-	char application_data		[ISODCL (884, 1395)];
-	char unused5			[ISODCL (1396, 2048)];
-};
-
-/* El Torito Boot Record Volume Descriptor */
-struct eltorito_boot_descriptor {
-        char id	           		[ISODCL (  1,    1)]; /* 711 */
-	char id2			[ISODCL (  2,    6)];
-	char version			[ISODCL (  7,    7)]; /* 711 */
-	char system_id			[ISODCL (  8,   39)];
-	char unused2			[ISODCL ( 40,   71)];
-        char bootcat_ptr                [ISODCL ( 72 ,  75)];
-	char unused5			[ISODCL ( 76, 2048)];
-};
-
-/* Validation entry for El Torito */
-struct eltorito_validation_entry {
-        char headerid          		[ISODCL (  1,    1)]; /* 711 */
-	char arch			[ISODCL (  2,    2)];
-	char pad1			[ISODCL (  3,    4)]; /* 711 */
-	char id  			[ISODCL (  5,   28)];
-	char cksum			[ISODCL ( 29,   30)];
-        char key1                       [ISODCL ( 31,   31)];
-	char key2			[ISODCL ( 32,   32)];
-};
-
-/* El Torito initial/default entry in boot catalog */
-struct eltorito_defaultboot_entry {
-        char boot_id           		[ISODCL (  1,    1)]; /* 711 */
-	char boot_media			[ISODCL (  2,    2)];
-	char loadseg			[ISODCL (  3,    4)]; /* 711 */
-	char arch  			[ISODCL (  5,    5)];
-	char pad1			[ISODCL (  6,    6)];
-        char nsect                      [ISODCL (  7,    8)];
-	char bootoff			[ISODCL (  9,   12)];
-        char pad2                       [ISODCL ( 13,   32)];
-};
-
-
-/* We use this to help us look up the parent inode numbers. */
-
-struct iso_path_table{
-	unsigned char  name_len[2];	/* 721 */
-	char extent[4];		/* 731 */
-	char  parent[2];	/* 721 */
-	char name[1];
-};
-
-struct iso_directory_record {
-	unsigned char length			[ISODCL (1, 1)]; /* 711 */
-	char ext_attr_length		[ISODCL (2, 2)]; /* 711 */
-	char extent			[ISODCL (3, 10)]; /* 733 */
-	char size			[ISODCL (11, 18)]; /* 733 */
-	char date			[ISODCL (19, 25)]; /* 7 by 711 */
-	char flags			[ISODCL (26, 26)];
-	char file_unit_size		[ISODCL (27, 27)]; /* 711 */
-	char interleave			[ISODCL (28, 28)]; /* 711 */
-	char volume_sequence_number	[ISODCL (29, 32)]; /* 723 */
-	unsigned char name_len		[ISODCL (33, 33)]; /* 711 */
-	char name			[34]; /* Not really, but we need something here */
-};
-#endif
-
-
-

Modified: trunk/packages/linux/config.x86
===================================================================
--- trunk/packages/linux/config.x86	2007-04-30 09:45:40 UTC (rev 1871)
+++ trunk/packages/linux/config.x86	2007-05-06 12:15:00 UTC (rev 1872)
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.20.6
-# Tue Apr 17 09:02:51 2007
+# Linux kernel version: 2.6.20.7
+# Wed May  2 21:58:41 2007
 #
 CONFIG_X86_32=y
 CONFIG_GENERIC_TIME=y
@@ -37,15 +37,14 @@
 # CONFIG_BSD_PROCESS_ACCT is not set
 # CONFIG_TASKSTATS is not set
 # CONFIG_UTS_NS is not set
-CONFIG_AUDIT=y
-CONFIG_AUDITSYSCALL=y
+# CONFIG_AUDIT is not set
 CONFIG_IKCONFIG=y
 CONFIG_IKCONFIG_PROC=y
 # CONFIG_CPUSETS is not set
 # CONFIG_SYSFS_DEPRECATED is not set
 # CONFIG_RELAY is not set
 CONFIG_INITRAMFS_SOURCE=""
-CONFIG_CC_OPTIMIZE_FOR_SIZE=y
+# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
 CONFIG_SYSCTL=y
 # CONFIG_EMBEDDED is not set
 CONFIG_UID16=y
@@ -82,7 +81,7 @@
 # Block layer
 #
 CONFIG_BLOCK=y
-CONFIG_LBD=y
+# CONFIG_LBD is not set
 # CONFIG_BLK_DEV_IO_TRACE is not set
 # CONFIG_LSF is not set
 
@@ -170,14 +169,15 @@
 CONFIG_TOSHIBA=m
 CONFIG_I8K=m
 CONFIG_X86_REBOOTFIXUPS=y
-# CONFIG_MICROCODE is not set
-# CONFIG_X86_MSR is not set
-# CONFIG_X86_CPUID is not set
+CONFIG_MICROCODE=m
+CONFIG_MICROCODE_OLD_INTERFACE=y
+CONFIG_X86_MSR=m
+CONFIG_X86_CPUID=m
 
 #
 # Firmware Drivers
 #
-# CONFIG_EDD is not set
+CONFIG_EDD=m
 # CONFIG_DELL_RBU is not set
 # CONFIG_DCDBAS is not set
 CONFIG_NOHIGHMEM=y
@@ -286,7 +286,12 @@
 # CONFIG_PCI_MSI is not set
 CONFIG_HT_IRQ=y
 CONFIG_ISA_DMA_API=y
-# CONFIG_ISA is not set
+CONFIG_ISA=y
+CONFIG_EISA=y
+# CONFIG_EISA_VLB_PRIMING is not set
+CONFIG_EISA_PCI_EISA=y
+CONFIG_EISA_VIRTUAL_ROOT=y
+CONFIG_EISA_NAMES=y
 # CONFIG_MCA is not set
 # CONFIG_SCx200 is not set
 CONFIG_K8_NB=y
@@ -312,6 +317,9 @@
 CONFIG_YENTA_TOSHIBA=y
 CONFIG_PD6729=m
 CONFIG_I82092=m
+CONFIG_I82365=m
+CONFIG_TCIC=m
+CONFIG_PCMCIA_PROBE=y
 CONFIG_PCCARD_NONSTATIC=m
 
 #
@@ -600,12 +608,16 @@
 #
 # Protocols
 #
+CONFIG_ISAPNP=y
+CONFIG_PNPBIOS=y
+# CONFIG_PNPBIOS_PROC_FS is not set
 CONFIG_PNPACPI=y
 
 #
 # Block devices
 #
 CONFIG_BLK_DEV_FD=y
+# CONFIG_BLK_DEV_XD is not set
 CONFIG_BLK_CPQ_DA=m
 CONFIG_BLK_CPQ_CISS_DA=m
 CONFIG_CISS_SCSI_TAPE=y
@@ -633,18 +645,18 @@
 #
 # ATA/ATAPI/MFM/RLL support
 #
-CONFIG_IDE=y
-CONFIG_BLK_DEV_IDE=y
+CONFIG_IDE=m
+CONFIG_BLK_DEV_IDE=m
 
 #
 # Please see Documentation/ide.txt for help/info on IDE drives
 #
 # CONFIG_BLK_DEV_IDE_SATA is not set
 # CONFIG_BLK_DEV_HD_IDE is not set
-CONFIG_BLK_DEV_IDEDISK=y
+CONFIG_BLK_DEV_IDEDISK=m
 CONFIG_IDEDISK_MULTI_MODE=y
 CONFIG_BLK_DEV_IDECS=m
-CONFIG_BLK_DEV_IDECD=y
+CONFIG_BLK_DEV_IDECD=m
 CONFIG_BLK_DEV_IDETAPE=m
 CONFIG_BLK_DEV_IDEFLOPPY=m
 # CONFIG_BLK_DEV_IDESCSI is not set
@@ -653,49 +665,50 @@
 #
 # IDE chipset support/bugfixes
 #
-CONFIG_IDE_GENERIC=y
+CONFIG_IDE_GENERIC=m
 CONFIG_BLK_DEV_CMD640=y
 # CONFIG_BLK_DEV_CMD640_ENHANCED is not set
 CONFIG_BLK_DEV_IDEPNP=y
 CONFIG_BLK_DEV_IDEPCI=y
 CONFIG_IDEPCI_SHARE_IRQ=y
 # CONFIG_BLK_DEV_OFFBOARD is not set
-CONFIG_BLK_DEV_GENERIC=y
-CONFIG_BLK_DEV_OPTI621=y
-CONFIG_BLK_DEV_RZ1000=y
+CONFIG_BLK_DEV_GENERIC=m
+CONFIG_BLK_DEV_OPTI621=m
+CONFIG_BLK_DEV_RZ1000=m
 CONFIG_BLK_DEV_IDEDMA_PCI=y
 # CONFIG_BLK_DEV_IDEDMA_FORCED is not set
 CONFIG_IDEDMA_PCI_AUTO=y
 # CONFIG_IDEDMA_ONLYDISK is not set
-CONFIG_BLK_DEV_AEC62XX=y
-CONFIG_BLK_DEV_ALI15X3=y
+CONFIG_BLK_DEV_AEC62XX=m
+CONFIG_BLK_DEV_ALI15X3=m
 # CONFIG_WDC_ALI15X3 is not set
-CONFIG_BLK_DEV_AMD74XX=y
-CONFIG_BLK_DEV_ATIIXP=y
-CONFIG_BLK_DEV_CMD64X=y
-CONFIG_BLK_DEV_TRIFLEX=y
-CONFIG_BLK_DEV_CY82C693=y
-CONFIG_BLK_DEV_CS5520=y
-CONFIG_BLK_DEV_CS5530=y
-CONFIG_BLK_DEV_CS5535=y
-CONFIG_BLK_DEV_HPT34X=y
+CONFIG_BLK_DEV_AMD74XX=m
+CONFIG_BLK_DEV_ATIIXP=m
+CONFIG_BLK_DEV_CMD64X=m
+CONFIG_BLK_DEV_TRIFLEX=m
+CONFIG_BLK_DEV_CY82C693=m
+CONFIG_BLK_DEV_CS5520=m
+CONFIG_BLK_DEV_CS5530=m
+CONFIG_BLK_DEV_CS5535=m
+CONFIG_BLK_DEV_HPT34X=m
 # CONFIG_HPT34X_AUTODMA is not set
-CONFIG_BLK_DEV_HPT366=y
-CONFIG_BLK_DEV_JMICRON=y
-CONFIG_BLK_DEV_SC1200=y
-CONFIG_BLK_DEV_PIIX=y
-CONFIG_BLK_DEV_IT821X=y
-CONFIG_BLK_DEV_NS87415=y
-CONFIG_BLK_DEV_PDC202XX_OLD=y
+CONFIG_BLK_DEV_HPT366=m
+CONFIG_BLK_DEV_JMICRON=m
+CONFIG_BLK_DEV_SC1200=m
+CONFIG_BLK_DEV_PIIX=m
+CONFIG_BLK_DEV_IT821X=m
+CONFIG_BLK_DEV_NS87415=m
+CONFIG_BLK_DEV_PDC202XX_OLD=m
 CONFIG_PDC202XX_BURST=y
-CONFIG_BLK_DEV_PDC202XX_NEW=y
-CONFIG_BLK_DEV_SVWKS=y
-CONFIG_BLK_DEV_SIIMAGE=y
-CONFIG_BLK_DEV_SIS5513=y
-CONFIG_BLK_DEV_SLC90E66=y
-CONFIG_BLK_DEV_TRM290=y
-CONFIG_BLK_DEV_VIA82CXXX=y
+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_IDE_ARM is not set
+# CONFIG_IDE_CHIPSETS is not set
 CONFIG_BLK_DEV_IDEDMA=y
 # CONFIG_IDEDMA_IVB is not set
 CONFIG_IDEDMA_AUTO=y
@@ -704,22 +717,22 @@
 #
 # SCSI device support
 #
-CONFIG_RAID_ATTRS=y
+CONFIG_RAID_ATTRS=m
 CONFIG_SCSI=y
-# CONFIG_SCSI_TGT is not set
+CONFIG_SCSI_TGT=m
 CONFIG_SCSI_NETLINK=y
 CONFIG_SCSI_PROC_FS=y
 
 #
 # SCSI support type (disk, tape, CD-ROM)
 #
-CONFIG_BLK_DEV_SD=y
+CONFIG_BLK_DEV_SD=m
 CONFIG_CHR_DEV_ST=m
 CONFIG_CHR_DEV_OSST=m
-CONFIG_BLK_DEV_SR=y
+CONFIG_BLK_DEV_SR=m
 # CONFIG_BLK_DEV_SR_VENDOR is not set
-CONFIG_CHR_DEV_SG=y
-CONFIG_CHR_DEV_SCH=y
+CONFIG_CHR_DEV_SG=m
+CONFIG_CHR_DEV_SCH=m
 
 #
 # Some SCSI devices (e.g. CD jukebox) support multiple LUNs
@@ -736,69 +749,96 @@
 CONFIG_SCSI_FC_ATTRS=y
 CONFIG_SCSI_ISCSI_ATTRS=y
 CONFIG_SCSI_SAS_ATTRS=y
-CONFIG_SCSI_SAS_LIBSAS=y
+CONFIG_SCSI_SAS_LIBSAS=m
 # CONFIG_SCSI_SAS_LIBSAS_DEBUG is not set
 
 #
 # SCSI low-level drivers
 #
-CONFIG_ISCSI_TCP=y
-CONFIG_BLK_DEV_3W_XXXX_RAID=y
-CONFIG_SCSI_3W_9XXX=y
-CONFIG_SCSI_ACARD=y
-CONFIG_SCSI_AACRAID=y
-CONFIG_SCSI_AIC7XXX=y
+CONFIG_ISCSI_TCP=m
+CONFIG_BLK_DEV_3W_XXXX_RAID=m
+CONFIG_SCSI_3W_9XXX=m
+CONFIG_SCSI_7000FASST=m
+CONFIG_SCSI_ACARD=m
+CONFIG_SCSI_AHA152X=m
+CONFIG_SCSI_AHA1542=m
+CONFIG_SCSI_AHA1740=m
+CONFIG_SCSI_AACRAID=m
+CONFIG_SCSI_AIC7XXX=m
 CONFIG_AIC7XXX_CMDS_PER_DEVICE=32
 CONFIG_AIC7XXX_RESET_DELAY_MS=15000
+# CONFIG_AIC7XXX_PROBE_EISA_VL is not set
 # CONFIG_AIC7XXX_DEBUG_ENABLE is not set
 CONFIG_AIC7XXX_DEBUG_MASK=0
 # CONFIG_AIC7XXX_REG_PRETTY_PRINT is not set
 # CONFIG_SCSI_AIC7XXX_OLD is not set
-CONFIG_SCSI_AIC79XX=y
+CONFIG_SCSI_AIC79XX=m
 CONFIG_AIC79XX_CMDS_PER_DEVICE=32
 CONFIG_AIC79XX_RESET_DELAY_MS=15000
 # CONFIG_AIC79XX_ENABLE_RD_STRM is not set
 CONFIG_AIC79XX_DEBUG_ENABLE=y
 CONFIG_AIC79XX_DEBUG_MASK=0
 CONFIG_AIC79XX_REG_PRETTY_PRINT=y
-# CONFIG_SCSI_AIC94XX is not set
-CONFIG_SCSI_DPT_I2O=y
-CONFIG_SCSI_ADVANSYS=y
-CONFIG_SCSI_ARCMSR=y
+CONFIG_SCSI_AIC94XX=m
+CONFIG_AIC94XX_DEBUG=y
+CONFIG_SCSI_DPT_I2O=m
+CONFIG_SCSI_ADVANSYS=m
+CONFIG_SCSI_IN2000=m
+CONFIG_SCSI_ARCMSR=m
 CONFIG_MEGARAID_NEWGEN=y
-CONFIG_MEGARAID_MM=y
-CONFIG_MEGARAID_MAILBOX=y
-CONFIG_MEGARAID_LEGACY=y
-CONFIG_MEGARAID_SAS=y
-CONFIG_SCSI_HPTIOP=y
-CONFIG_SCSI_BUSLOGIC=y
+CONFIG_MEGARAID_MM=m
+CONFIG_MEGARAID_MAILBOX=m
+CONFIG_MEGARAID_LEGACY=m
+CONFIG_MEGARAID_SAS=m
+CONFIG_SCSI_HPTIOP=m
+CONFIG_SCSI_BUSLOGIC=m
 # CONFIG_SCSI_OMIT_FLASHPOINT is not set
-CONFIG_SCSI_DMX3191D=y
+CONFIG_SCSI_DMX3191D=m
+CONFIG_SCSI_DTC3280=m
 CONFIG_SCSI_EATA=y
 # CONFIG_SCSI_EATA_TAGGED_QUEUE is not set
 # CONFIG_SCSI_EATA_LINKED_COMMANDS is not set
 CONFIG_SCSI_EATA_MAX_TAGS=16
-CONFIG_SCSI_FUTURE_DOMAIN=y
-CONFIG_SCSI_GDTH=y
-CONFIG_SCSI_IPS=y
-CONFIG_SCSI_INITIO=y
-CONFIG_SCSI_INIA100=y
-CONFIG_SCSI_STEX=y
-CONFIG_SCSI_SYM53C8XX_2=y
+CONFIG_SCSI_FUTURE_DOMAIN=m
+CONFIG_SCSI_GDTH=m
+CONFIG_SCSI_GENERIC_NCR5380=m
+CONFIG_SCSI_GENERIC_NCR5380_MMIO=m
+CONFIG_SCSI_GENERIC_NCR53C400=y
+CONFIG_SCSI_IPS=m
+CONFIG_SCSI_INITIO=m
+CONFIG_SCSI_INIA100=m
+CONFIG_SCSI_NCR53C406A=m
+CONFIG_SCSI_STEX=m
+CONFIG_SCSI_SYM53C8XX_2=m
 CONFIG_SCSI_SYM53C8XX_DMA_ADDRESSING_MODE=1
 CONFIG_SCSI_SYM53C8XX_DEFAULT_TAGS=16
 CONFIG_SCSI_SYM53C8XX_MAX_TAGS=64
 CONFIG_SCSI_SYM53C8XX_MMIO=y
-# CONFIG_SCSI_IPR is not set
-CONFIG_SCSI_QLOGIC_1280=y
-# CONFIG_SCSI_QLA_FC is not set
-# CONFIG_SCSI_QLA_ISCSI is not set
-CONFIG_SCSI_LPFC=y
-CONFIG_SCSI_DC395x=y
-CONFIG_SCSI_DC390T=y
-CONFIG_SCSI_NSP32=y
+CONFIG_SCSI_IPR=m
+CONFIG_SCSI_IPR_TRACE=y
+CONFIG_SCSI_IPR_DUMP=y
+CONFIG_SCSI_PAS16=m
+CONFIG_SCSI_PSI240I=m
+CONFIG_SCSI_QLOGIC_FAS=m
+CONFIG_SCSI_QLOGIC_1280=m
+CONFIG_SCSI_QLA_FC=m
+CONFIG_SCSI_QLA_ISCSI=m
+CONFIG_SCSI_LPFC=m
+CONFIG_SCSI_SEAGATE=m
+CONFIG_SCSI_SIM710=m
+CONFIG_53C700_IO_MAPPED=y
+CONFIG_SCSI_SYM53C416=m
+CONFIG_SCSI_DC395x=m
+CONFIG_SCSI_DC390T=m
+CONFIG_SCSI_T128=m
+CONFIG_SCSI_U14_34F=m
+# CONFIG_SCSI_U14_34F_TAGGED_QUEUE is not set
+# CONFIG_SCSI_U14_34F_LINKED_COMMANDS is not set
+CONFIG_SCSI_U14_34F_MAX_TAGS=8
+CONFIG_SCSI_ULTRASTOR=m
+CONFIG_SCSI_NSP32=m
 # CONFIG_SCSI_DEBUG is not set
-# CONFIG_SCSI_SRP is not set
+CONFIG_SCSI_SRP=m
 
 #
 # PCMCIA SCSI adapter support
@@ -812,62 +852,70 @@
 #
 # Serial ATA (prod) and Parallel ATA (experimental) drivers
 #
-CONFIG_ATA=y
+CONFIG_ATA=m
 # CONFIG_ATA_NONSTANDARD is not set
-CONFIG_SATA_AHCI=y
-CONFIG_SATA_SVW=y
-CONFIG_ATA_PIIX=y
-CONFIG_SATA_MV=y
-CONFIG_SATA_NV=y
-CONFIG_PDC_ADMA=y
-CONFIG_SATA_QSTOR=y
-CONFIG_SATA_PROMISE=y
-CONFIG_SATA_SX4=y
-CONFIG_SATA_SIL=y
-CONFIG_SATA_SIL24=y
-CONFIG_SATA_SIS=y
-CONFIG_SATA_ULI=y
-CONFIG_SATA_VIA=y
-CONFIG_SATA_VITESSE=y
-CONFIG_SATA_INTEL_COMBINED=y
-# CONFIG_PATA_ALI is not set
-# CONFIG_PATA_AMD is not set
-# CONFIG_PATA_ARTOP is not set
-# CONFIG_PATA_ATIIXP is not set
-# CONFIG_PATA_CMD64X is not set
-# CONFIG_PATA_CS5520 is not set
-# CONFIG_PATA_CS5530 is not set
-# CONFIG_PATA_CS5535 is not set
-# CONFIG_PATA_CYPRESS is not set
-# CONFIG_PATA_EFAR is not set
-# CONFIG_ATA_GENERIC is not set
-# CONFIG_PATA_HPT366 is not set
-# CONFIG_PATA_HPT37X is not set
-# CONFIG_PATA_HPT3X2N is not set
-# CONFIG_PATA_HPT3X3 is not set
-# CONFIG_PATA_IT821X is not set
-# CONFIG_PATA_JMICRON is not set
-# CONFIG_PATA_TRIFLEX is not set
-# CONFIG_PATA_MARVELL is not set
-# CONFIG_PATA_MPIIX is not set
-# CONFIG_PATA_OLDPIIX is not set
-# CONFIG_PATA_NETCELL is not set
-# CONFIG_PATA_NS87410 is not set
-# CONFIG_PATA_OPTI is not set
-# CONFIG_PATA_OPTIDMA is not set
-# CONFIG_PATA_PCMCIA is not set
-# CONFIG_PATA_PDC_OLD is not set
-# CONFIG_PATA_RADISYS is not set
-# CONFIG_PATA_RZ1000 is not set
-# CONFIG_PATA_SC1200 is not set
-# CONFIG_PATA_SERVERWORKS is not set
-# CONFIG_PATA_PDC2027X is not set
-# CONFIG_PATA_SIL680 is not set
-# CONFIG_PATA_SIS is not set
-# CONFIG_PATA_VIA is not set
-# CONFIG_PATA_WINBOND is not set
+CONFIG_SATA_AHCI=m
+CONFIG_SATA_SVW=m
+CONFIG_ATA_PIIX=m
+CONFIG_SATA_MV=m
+CONFIG_SATA_NV=m
+CONFIG_PDC_ADMA=m
+CONFIG_SATA_QSTOR=m
+CONFIG_SATA_PROMISE=m
+CONFIG_SATA_SX4=m
+CONFIG_SATA_SIL=m
+CONFIG_SATA_SIL24=m
+CONFIG_SATA_SIS=m
+CONFIG_SATA_ULI=m
+CONFIG_SATA_VIA=m
+CONFIG_SATA_VITESSE=m
+CONFIG_PATA_ALI=m
+CONFIG_PATA_AMD=m
+CONFIG_PATA_ARTOP=m
+CONFIG_PATA_ATIIXP=m
+CONFIG_PATA_CMD64X=m
+CONFIG_PATA_CS5520=m
+CONFIG_PATA_CS5530=m
+CONFIG_PATA_CS5535=m
+CONFIG_PATA_CYPRESS=m
+CONFIG_PATA_EFAR=m
+CONFIG_ATA_GENERIC=m
+CONFIG_PATA_HPT366=m
+CONFIG_PATA_HPT37X=m
+CONFIG_PATA_HPT3X2N=m
+CONFIG_PATA_HPT3X3=m
+CONFIG_PATA_ISAPNP=m
+CONFIG_PATA_IT821X=m
+CONFIG_PATA_JMICRON=m
+CONFIG_PATA_LEGACY=m
+CONFIG_PATA_TRIFLEX=m
+CONFIG_PATA_MARVELL=m
+CONFIG_PATA_MPIIX=m
+CONFIG_PATA_OLDPIIX=m
+CONFIG_PATA_NETCELL=m
+CONFIG_PATA_NS87410=m
+CONFIG_PATA_OPTI=m
+CONFIG_PATA_OPTIDMA=m
+CONFIG_PATA_PCMCIA=m
+CONFIG_PATA_PDC_OLD=m
+CONFIG_PATA_QDI=m
+CONFIG_PATA_RADISYS=m
+CONFIG_PATA_RZ1000=m
+CONFIG_PATA_SC1200=m
+CONFIG_PATA_SERVERWORKS=m
+CONFIG_PATA_PDC2027X=m
+CONFIG_PATA_SIL680=m
+CONFIG_PATA_SIS=m
+CONFIG_PATA_VIA=m
+CONFIG_PATA_WINBOND=m
+CONFIG_PATA_WINBOND_VLB=m
 
 #
+# Old CD-ROM drivers (not SCSI, not IDE)
+#
+# CONFIG_CD_NO_IDESCSI is not set
+
+#
 # Multi-device support (RAID and LVM)
 #
 CONFIG_MD=y
@@ -893,16 +941,16 @@
 # Fusion MPT device support
 #
 CONFIG_FUSION=y
-CONFIG_FUSION_SPI=y
-CONFIG_FUSION_FC=y
-CONFIG_FUSION_SAS=y
+CONFIG_FUSION_SPI=m
+CONFIG_FUSION_FC=m
+CONFIG_FUSION_SAS=m
 CONFIG_FUSION_MAX_SGE=128
 # CONFIG_FUSION_CTL is not set
 
 #
 # IEEE 1394 (FireWire) support
 #
-CONFIG_IEEE1394=y
+CONFIG_IEEE1394=m
 
 #
 # Subsystem Options
@@ -920,13 +968,13 @@
 #
 # Texas Instruments PCILynx requires I2C
 #
-CONFIG_IEEE1394_OHCI1394=y
+CONFIG_IEEE1394_OHCI1394=m
 
 #
 # Protocol Drivers
 #
 # CONFIG_IEEE1394_VIDEO1394 is not set
-CONFIG_IEEE1394_SBP2=y
+CONFIG_IEEE1394_SBP2=m
 # CONFIG_IEEE1394_SBP2_PHYS_DMA is not set
 CONFIG_IEEE1394_ETH1394=m
 # CONFIG_IEEE1394_DV1394 is not set
@@ -984,8 +1032,23 @@
 CONFIG_SUNGEM=m
 CONFIG_CASSINI=m
 CONFIG_NET_VENDOR_3COM=y
+CONFIG_EL1=m
+CONFIG_EL2=m
+CONFIG_ELPLUS=m
+CONFIG_EL16=m
+CONFIG_EL3=m
+CONFIG_3C515=m
 CONFIG_VORTEX=m
 CONFIG_TYPHOON=m
+# CONFIG_LANCE is not set
+CONFIG_NET_VENDOR_SMC=y
+CONFIG_WD80x3=m
+CONFIG_ULTRA=m
+CONFIG_ULTRA32=m
+CONFIG_SMC9194=m
+CONFIG_NET_VENDOR_RACAL=y
+CONFIG_NI52=m
+CONFIG_NI65=m
 
 #
 # Tulip family network device support
@@ -1001,7 +1064,21 @@
 CONFIG_DM9102=m
 CONFIG_ULI526X=m
 CONFIG_PCMCIA_XIRCOM=m
+CONFIG_AT1700=m
+CONFIG_DEPCA=m
 CONFIG_HP100=m
+CONFIG_NET_ISA=y
+CONFIG_E2100=m
+CONFIG_EWRK3=m
+CONFIG_EEXPRESS=m
+CONFIG_EEXPRESS_PRO=m
+CONFIG_HPLAN_PLUS=m
+CONFIG_HPLAN=m
+CONFIG_LP486E=m
+CONFIG_ETH16I=m
+CONFIG_NE2000=m
+CONFIG_ZNET=m
+CONFIG_SEEQ8005=m
 CONFIG_NET_PCI=y
 CONFIG_PCNET32=m
 # CONFIG_PCNET32_NAPI is not set
@@ -1009,15 +1086,21 @@
 CONFIG_AMD8111E_NAPI=y
 CONFIG_ADAPTEC_STARFIRE=m
 CONFIG_ADAPTEC_STARFIRE_NAPI=y
+CONFIG_AC3200=m
+CONFIG_APRICOT=m
 CONFIG_B44=m
 CONFIG_FORCEDETH=m
 # CONFIG_FORCEDETH_NAPI is not set
+CONFIG_CS89x0=m
 CONFIG_DGRS=m
 CONFIG_EEPRO100=m
 CONFIG_E100=m
+CONFIG_LNE390=m
 CONFIG_FEALNX=m
 CONFIG_NATSEMI=m
 CONFIG_NE2K_PCI=m
+CONFIG_NE3210=m
+CONFIG_ES3210=m
 CONFIG_8139CP=m
 CONFIG_8139TOO=m
 # CONFIG_8139TOO_PIO is not set
@@ -1084,6 +1167,8 @@
 # Obsolete Wireless cards support (pre-802.11)
 #
 CONFIG_STRIP=m
+# CONFIG_ARLAN is not set
+# CONFIG_WAVELAN is not set
 CONFIG_PCMCIA_WAVELAN=m
 CONFIG_PCMCIA_NETWAVE=m
 
@@ -1212,6 +1297,9 @@
 CONFIG_INPUT_MOUSE=y
 CONFIG_MOUSE_PS2=y
 CONFIG_MOUSE_SERIAL=m
+# CONFIG_MOUSE_INPORT is not set
+# CONFIG_MOUSE_LOGIBM is not set
+# CONFIG_MOUSE_PC110PAD is not set
 # CONFIG_MOUSE_VSXXXAA is not set
 # CONFIG_INPUT_JOYSTICK is not set
 # CONFIG_INPUT_TOUCHSCREEN is not set
@@ -1405,6 +1493,7 @@
 CONFIG_VGACON_SOFT_SCROLLBACK=y
 CONFIG_VGACON_SOFT_SCROLLBACK_SIZE=64
 CONFIG_VIDEO_SELECT=y
+# CONFIG_MDA_CONSOLE is not set
 CONFIG_DUMMY_CONSOLE=y
 CONFIG_FRAMEBUFFER_CONSOLE=y
 # CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set
@@ -1453,6 +1542,7 @@
 #
 CONFIG_SND_MPU401_UART=m
 CONFIG_SND_OPL3_LIB=m
+CONFIG_SND_OPL4_LIB=m
 CONFIG_SND_VX_LIB=m
 CONFIG_SND_AC97_CODEC=m
 # CONFIG_SND_DUMMY is not set
@@ -1461,6 +1551,43 @@
 # CONFIG_SND_MPU401 is not set
 
 #
+# ISA devices
+#
+CONFIG_SND_AD1848_LIB=m
+CONFIG_SND_CS4231_LIB=m
+CONFIG_SND_ADLIB=m
+CONFIG_SND_AD1816A=m
+CONFIG_SND_AD1848=m
+CONFIG_SND_ALS100=m
+CONFIG_SND_AZT2320=m
+CONFIG_SND_CMI8330=m
+CONFIG_SND_CS4231=m
+CONFIG_SND_CS4232=m
+CONFIG_SND_CS4236=m
+CONFIG_SND_DT019X=m
+CONFIG_SND_ES968=m
+CONFIG_SND_ES1688=m
+CONFIG_SND_ES18XX=m
+CONFIG_SND_GUS_SYNTH=m
+CONFIG_SND_GUSCLASSIC=m
+CONFIG_SND_GUSEXTREME=m
+CONFIG_SND_GUSMAX=m
+CONFIG_SND_INTERWAVE=m
+CONFIG_SND_INTERWAVE_STB=m
+CONFIG_SND_OPL3SA2=m
+CONFIG_SND_OPTI92X_AD1848=m
+CONFIG_SND_OPTI92X_CS4231=m
+CONFIG_SND_OPTI93X=m
+CONFIG_SND_MIRO=m
+CONFIG_SND_SB8=m
+CONFIG_SND_SB16=m
+CONFIG_SND_SBAWE=m
+CONFIG_SND_SB16_CSP=y
+CONFIG_SND_SGALAXY=m
+CONFIG_SND_SSCAPE=m
+CONFIG_SND_WAVEFRONT=m
+
+#
 # PCI devices
 #
 CONFIG_SND_AD1889=m
@@ -1554,7 +1681,7 @@
 CONFIG_USB_ARCH_HAS_HCD=y
 CONFIG_USB_ARCH_HAS_OHCI=y
 CONFIG_USB_ARCH_HAS_EHCI=y
-CONFIG_USB=y
+CONFIG_USB=m
 # CONFIG_USB_DEBUG is not set
 
 #
@@ -1569,15 +1696,15 @@
 #
 # USB Host Controller Drivers
 #
-CONFIG_USB_EHCI_HCD=y
+CONFIG_USB_EHCI_HCD=m
 CONFIG_USB_EHCI_SPLIT_ISO=y
 # CONFIG_USB_EHCI_ROOT_HUB_TT is not set
 # CONFIG_USB_EHCI_TT_NEWSCHED is not set
 # CONFIG_USB_ISP116X_HCD is not set
-CONFIG_USB_OHCI_HCD=y
+CONFIG_USB_OHCI_HCD=m
 # CONFIG_USB_OHCI_BIG_ENDIAN is not set
 CONFIG_USB_OHCI_LITTLE_ENDIAN=y
-CONFIG_USB_UHCI_HCD=y
+CONFIG_USB_UHCI_HCD=m
 # CONFIG_USB_SL811_HCD is not set
 
 #
@@ -1593,7 +1720,7 @@
 #
 # may also be needed; see USB_STORAGE Help for more information
 #
-CONFIG_USB_STORAGE=y
+CONFIG_USB_STORAGE=m
 # CONFIG_USB_STORAGE_DEBUG is not set
 CONFIG_USB_STORAGE_DATAFAB=y
 CONFIG_USB_STORAGE_FREECOM=y
@@ -1610,10 +1737,16 @@
 #
 # USB Input Devices
 #
-CONFIG_USB_HID=y
+CONFIG_USB_HID=m
 CONFIG_USB_HIDINPUT_POWERBOOK=y
 # CONFIG_HID_FF is not set
 CONFIG_USB_HIDDEV=y
+
+#
+# USB HID Boot Protocol drivers
+#
+# CONFIG_USB_KBD is not set
+# CONFIG_USB_MOUSE is not set
 # CONFIG_USB_AIPTEK is not set
 # CONFIG_USB_WACOM is not set
 # CONFIG_USB_ACECAD is not set
@@ -1814,14 +1947,20 @@
 #
 # File systems
 #
-CONFIG_EXT2_FS=y
+CONFIG_EXT2_FS=m
 # CONFIG_EXT2_FS_XATTR is not set
 # CONFIG_EXT2_FS_XIP is not set
-CONFIG_EXT3_FS=y
+CONFIG_EXT3_FS=m
 # CONFIG_EXT3_FS_XATTR is not set
-# CONFIG_EXT4DEV_FS is not set
-CONFIG_JBD=y
+CONFIG_EXT4DEV_FS=m
+CONFIG_EXT4DEV_FS_XATTR=y
+# CONFIG_EXT4DEV_FS_POSIX_ACL is not set
+# CONFIG_EXT4DEV_FS_SECURITY is not set
+CONFIG_JBD=m
 # CONFIG_JBD_DEBUG is not set
+CONFIG_JBD2=m
+# CONFIG_JBD2_DEBUG is not set
+CONFIG_FS_MBCACHE=m
 CONFIG_REISERFS_FS=m
 # CONFIG_REISERFS_CHECK is not set
 CONFIG_REISERFS_PROC_INFO=y
@@ -1852,10 +1991,10 @@
 #
 # CD-ROM/DVD Filesystems
 #
-CONFIG_ISO9660_FS=y
+CONFIG_ISO9660_FS=m
 CONFIG_JOLIET=y
 CONFIG_ZISOFS=y
-CONFIG_ZISOFS_FS=y
+CONFIG_ZISOFS_FS=m
 CONFIG_UDF_FS=m
 CONFIG_UDF_NLS=y
 
@@ -2073,8 +2212,7 @@
 CONFIG_CRC16=m
 CONFIG_CRC32=y
 CONFIG_LIBCRC32C=y
-CONFIG_AUDIT_GENERIC=y
-CONFIG_ZLIB_INFLATE=y
+CONFIG_ZLIB_INFLATE=m
 CONFIG_ZLIB_DEFLATE=m
 CONFIG_TEXTSEARCH=y
 CONFIG_TEXTSEARCH_KMP=m

Modified: trunk/packages/linux64/config.x86_64
===================================================================
--- trunk/packages/linux64/config.x86_64	2007-04-30 09:45:40 UTC (rev 1871)
+++ trunk/packages/linux64/config.x86_64	2007-05-06 12:15:00 UTC (rev 1872)
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.20.6
-# Tue Apr 17 11:43:15 2007
+# Linux kernel version: 2.6.20.7
+# Thu May  3 10:19:51 2007
 #
 CONFIG_X86_64=y
 CONFIG_64BIT=y
@@ -46,15 +46,14 @@
 # CONFIG_BSD_PROCESS_ACCT is not set
 # CONFIG_TASKSTATS is not set
 # CONFIG_UTS_NS is not set
-CONFIG_AUDIT=y
-CONFIG_AUDITSYSCALL=y
+# CONFIG_AUDIT is not set
 CONFIG_IKCONFIG=y
 CONFIG_IKCONFIG_PROC=y
 # CONFIG_CPUSETS is not set
 # CONFIG_SYSFS_DEPRECATED is not set
 # CONFIG_RELAY is not set
 CONFIG_INITRAMFS_SOURCE=""
-CONFIG_CC_OPTIMIZE_FOR_SIZE=y
+# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
 CONFIG_SYSCTL=y
 # CONFIG_EMBEDDED is not set
 CONFIG_UID16=y
@@ -120,9 +119,10 @@
 CONFIG_X86_INTERNODE_CACHE_BYTES=128
 CONFIG_X86_TSC=y
 CONFIG_X86_GOOD_APIC=y
-# CONFIG_MICROCODE is not set
-# CONFIG_X86_MSR is not set
-# CONFIG_X86_CPUID is not set
+CONFIG_MICROCODE=m
+CONFIG_MICROCODE_OLD_INTERFACE=y
+CONFIG_X86_MSR=m
+CONFIG_X86_CPUID=m
 CONFIG_X86_HT=y
 CONFIG_X86_IO_APIC=y
 CONFIG_X86_LOCAL_APIC=y
@@ -202,27 +202,27 @@
 CONFIG_ACPI_SLEEP=y
 CONFIG_ACPI_SLEEP_PROC_FS=y
 # CONFIG_ACPI_SLEEP_PROC_SLEEP is not set
-CONFIG_ACPI_AC=m
-CONFIG_ACPI_BATTERY=m
-CONFIG_ACPI_BUTTON=m
-CONFIG_ACPI_VIDEO=m
-CONFIG_ACPI_HOTKEY=m
-CONFIG_ACPI_FAN=m
-CONFIG_ACPI_DOCK=m
-CONFIG_ACPI_PROCESSOR=m
+CONFIG_ACPI_AC=y
+CONFIG_ACPI_BATTERY=y
+CONFIG_ACPI_BUTTON=y
+CONFIG_ACPI_VIDEO=y
+CONFIG_ACPI_HOTKEY=y
+CONFIG_ACPI_FAN=y
+CONFIG_ACPI_DOCK=y
+CONFIG_ACPI_PROCESSOR=y
 CONFIG_ACPI_HOTPLUG_CPU=y
-CONFIG_ACPI_THERMAL=m
+CONFIG_ACPI_THERMAL=y
 CONFIG_ACPI_NUMA=y
-CONFIG_ACPI_ASUS=m
-CONFIG_ACPI_IBM=m
-CONFIG_ACPI_TOSHIBA=m
+CONFIG_ACPI_ASUS=y
+CONFIG_ACPI_IBM=y
+CONFIG_ACPI_TOSHIBA=y
 CONFIG_ACPI_BLACKLIST_YEAR=0
 # CONFIG_ACPI_DEBUG is not set
 CONFIG_ACPI_EC=y
 CONFIG_ACPI_POWER=y
 CONFIG_ACPI_SYSTEM=y
 CONFIG_X86_PM_TIMER=y
-CONFIG_ACPI_CONTAINER=m
+CONFIG_ACPI_CONTAINER=y
 
 #
 # CPU Frequency scaling
@@ -622,23 +622,23 @@
 # CONFIG_IBM_ASM is not set
 # CONFIG_SGI_IOC4 is not set
 # CONFIG_TIFM_CORE is not set
-# CONFIG_MSI_LAPTOP is not set
+CONFIG_MSI_LAPTOP=m
 
 #
 # ATA/ATAPI/MFM/RLL support
 #
-CONFIG_IDE=y
-CONFIG_BLK_DEV_IDE=y
+CONFIG_IDE=m
+CONFIG_BLK_DEV_IDE=m
 
 #
 # Please see Documentation/ide.txt for help/info on IDE drives
 #
 # CONFIG_BLK_DEV_IDE_SATA is not set
 # CONFIG_BLK_DEV_HD_IDE is not set
-CONFIG_BLK_DEV_IDEDISK=y
+CONFIG_BLK_DEV_IDEDISK=m
 CONFIG_IDEDISK_MULTI_MODE=y
 CONFIG_BLK_DEV_IDECS=m
-CONFIG_BLK_DEV_IDECD=y
+CONFIG_BLK_DEV_IDECD=m
 CONFIG_BLK_DEV_IDETAPE=m
 CONFIG_BLK_DEV_IDEFLOPPY=m
 # CONFIG_BLK_DEV_IDESCSI is not set
@@ -647,47 +647,47 @@
 #
 # IDE chipset support/bugfixes
 #
-CONFIG_IDE_GENERIC=y
+CONFIG_IDE_GENERIC=m
 CONFIG_BLK_DEV_CMD640=y
 # CONFIG_BLK_DEV_CMD640_ENHANCED is not set
 CONFIG_BLK_DEV_IDEPNP=y
 CONFIG_BLK_DEV_IDEPCI=y
 CONFIG_IDEPCI_SHARE_IRQ=y
 # CONFIG_BLK_DEV_OFFBOARD is not set
-CONFIG_BLK_DEV_GENERIC=y
-CONFIG_BLK_DEV_OPTI621=y
-CONFIG_BLK_DEV_RZ1000=y
+CONFIG_BLK_DEV_GENERIC=m
+CONFIG_BLK_DEV_OPTI621=m
+CONFIG_BLK_DEV_RZ1000=m
 CONFIG_BLK_DEV_IDEDMA_PCI=y
 # CONFIG_BLK_DEV_IDEDMA_FORCED is not set
 CONFIG_IDEDMA_PCI_AUTO=y
 # CONFIG_IDEDMA_ONLYDISK is not set
-CONFIG_BLK_DEV_AEC62XX=y
-CONFIG_BLK_DEV_ALI15X3=y
+CONFIG_BLK_DEV_AEC62XX=m
+CONFIG_BLK_DEV_ALI15X3=m
 # CONFIG_WDC_ALI15X3 is not set
-CONFIG_BLK_DEV_AMD74XX=y
-CONFIG_BLK_DEV_ATIIXP=y
-CONFIG_BLK_DEV_CMD64X=y
-CONFIG_BLK_DEV_TRIFLEX=y
-CONFIG_BLK_DEV_CY82C693=y
-CONFIG_BLK_DEV_CS5520=y
-CONFIG_BLK_DEV_CS5530=y
-CONFIG_BLK_DEV_HPT34X=y
+CONFIG_BLK_DEV_AMD74XX=m
+CONFIG_BLK_DEV_ATIIXP=m
+CONFIG_BLK_DEV_CMD64X=m
+CONFIG_BLK_DEV_TRIFLEX=m
+CONFIG_BLK_DEV_CY82C693=m
+CONFIG_BLK_DEV_CS5520=m
+CONFIG_BLK_DEV_CS5530=m
+CONFIG_BLK_DEV_HPT34X=m
 # CONFIG_HPT34X_AUTODMA is not set
-CONFIG_BLK_DEV_HPT366=y
-CONFIG_BLK_DEV_JMICRON=y
-CONFIG_BLK_DEV_SC1200=y
-CONFIG_BLK_DEV_PIIX=y
-CONFIG_BLK_DEV_IT821X=y
-CONFIG_BLK_DEV_NS87415=y
-CONFIG_BLK_DEV_PDC202XX_OLD=y
+CONFIG_BLK_DEV_HPT366=m
+CONFIG_BLK_DEV_JMICRON=m
+CONFIG_BLK_DEV_SC1200=m
+CONFIG_BLK_DEV_PIIX=m
+CONFIG_BLK_DEV_IT821X=m
+CONFIG_BLK_DEV_NS87415=m
+CONFIG_BLK_DEV_PDC202XX_OLD=m
 CONFIG_PDC202XX_BURST=y
-CONFIG_BLK_DEV_PDC202XX_NEW=y
-CONFIG_BLK_DEV_SVWKS=y
-CONFIG_BLK_DEV_SIIMAGE=y
-CONFIG_BLK_DEV_SIS5513=y
-CONFIG_BLK_DEV_SLC90E66=y
-CONFIG_BLK_DEV_TRM290=y
-CONFIG_BLK_DEV_VIA82CXXX=y
+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_IDE_ARM is not set
 CONFIG_BLK_DEV_IDEDMA=y
 # CONFIG_IDEDMA_IVB is not set
@@ -697,22 +697,22 @@
 #
 # SCSI device support
 #
-CONFIG_RAID_ATTRS=y
+CONFIG_RAID_ATTRS=m
 CONFIG_SCSI=y
-# CONFIG_SCSI_TGT is not set
+CONFIG_SCSI_TGT=m
 CONFIG_SCSI_NETLINK=y
 CONFIG_SCSI_PROC_FS=y
 
 #
 # SCSI support type (disk, tape, CD-ROM)
 #
-CONFIG_BLK_DEV_SD=y
+CONFIG_BLK_DEV_SD=m
 CONFIG_CHR_DEV_ST=m
 CONFIG_CHR_DEV_OSST=m
-CONFIG_BLK_DEV_SR=y
+CONFIG_BLK_DEV_SR=m
 # CONFIG_BLK_DEV_SR_VENDOR is not set
-CONFIG_CHR_DEV_SG=y
-CONFIG_CHR_DEV_SCH=y
+CONFIG_CHR_DEV_SG=m
+CONFIG_CHR_DEV_SCH=m
 
 #
 # Some SCSI devices (e.g. CD jukebox) support multiple LUNs
@@ -729,130 +729,132 @@
 CONFIG_SCSI_FC_ATTRS=y
 CONFIG_SCSI_ISCSI_ATTRS=y
 CONFIG_SCSI_SAS_ATTRS=y
-CONFIG_SCSI_SAS_LIBSAS=y
+CONFIG_SCSI_SAS_LIBSAS=m
 # CONFIG_SCSI_SAS_LIBSAS_DEBUG is not set
 
 #
 # SCSI low-level drivers
 #
 CONFIG_ISCSI_TCP=m
-CONFIG_BLK_DEV_3W_XXXX_RAID=y
-CONFIG_SCSI_3W_9XXX=y
-CONFIG_SCSI_ACARD=y
-CONFIG_SCSI_AACRAID=y
-CONFIG_SCSI_AIC7XXX=y
+CONFIG_BLK_DEV_3W_XXXX_RAID=m
+CONFIG_SCSI_3W_9XXX=m
+CONFIG_SCSI_ACARD=m
+CONFIG_SCSI_AACRAID=m
+CONFIG_SCSI_AIC7XXX=m
 CONFIG_AIC7XXX_CMDS_PER_DEVICE=32
 CONFIG_AIC7XXX_RESET_DELAY_MS=15000
 # CONFIG_AIC7XXX_DEBUG_ENABLE is not set
 CONFIG_AIC7XXX_DEBUG_MASK=0
 # CONFIG_AIC7XXX_REG_PRETTY_PRINT is not set
 # CONFIG_SCSI_AIC7XXX_OLD is not set
-CONFIG_SCSI_AIC79XX=y
+CONFIG_SCSI_AIC79XX=m
 CONFIG_AIC79XX_CMDS_PER_DEVICE=32
 CONFIG_AIC79XX_RESET_DELAY_MS=15000
 # CONFIG_AIC79XX_ENABLE_RD_STRM is not set
 # CONFIG_AIC79XX_DEBUG_ENABLE is not set
 CONFIG_AIC79XX_DEBUG_MASK=0
 # CONFIG_AIC79XX_REG_PRETTY_PRINT is not set
-# CONFIG_SCSI_AIC94XX is not set
-CONFIG_SCSI_ARCMSR=y
+CONFIG_SCSI_AIC94XX=m
+# CONFIG_AIC94XX_DEBUG is not set
+CONFIG_SCSI_ARCMSR=m
 CONFIG_MEGARAID_NEWGEN=y
-CONFIG_MEGARAID_MM=y
-CONFIG_MEGARAID_MAILBOX=y
-CONFIG_MEGARAID_LEGACY=y
-CONFIG_MEGARAID_SAS=y
-CONFIG_SCSI_HPTIOP=y
-CONFIG_SCSI_BUSLOGIC=y
+CONFIG_MEGARAID_MM=m
+CONFIG_MEGARAID_MAILBOX=m
+CONFIG_MEGARAID_LEGACY=m
+CONFIG_MEGARAID_SAS=m
+CONFIG_SCSI_HPTIOP=m
+CONFIG_SCSI_BUSLOGIC=m
 # CONFIG_SCSI_OMIT_FLASHPOINT is not set
-CONFIG_SCSI_DMX3191D=y
-CONFIG_SCSI_EATA=y
+CONFIG_SCSI_DMX3191D=m
+CONFIG_SCSI_EATA=m
 # CONFIG_SCSI_EATA_TAGGED_QUEUE is not set
 # CONFIG_SCSI_EATA_LINKED_COMMANDS is not set
 CONFIG_SCSI_EATA_MAX_TAGS=16
-# CONFIG_SCSI_FUTURE_DOMAIN is not set
-CONFIG_SCSI_GDTH=y
-CONFIG_SCSI_IPS=y
-CONFIG_SCSI_INITIO=y
-CONFIG_SCSI_INIA100=y
-CONFIG_SCSI_STEX=y
-CONFIG_SCSI_SYM53C8XX_2=y
+CONFIG_SCSI_FUTURE_DOMAIN=m
+CONFIG_SCSI_GDTH=m
+CONFIG_SCSI_IPS=m
+CONFIG_SCSI_INITIO=m
+CONFIG_SCSI_INIA100=m
+CONFIG_SCSI_STEX=m
+CONFIG_SCSI_SYM53C8XX_2=m
 CONFIG_SCSI_SYM53C8XX_DMA_ADDRESSING_MODE=1
 CONFIG_SCSI_SYM53C8XX_DEFAULT_TAGS=16
 CONFIG_SCSI_SYM53C8XX_MAX_TAGS=64
 CONFIG_SCSI_SYM53C8XX_MMIO=y
-# CONFIG_SCSI_IPR is not set
-CONFIG_SCSI_QLOGIC_1280=y
-# CONFIG_SCSI_QLA_FC is not set
-CONFIG_SCSI_QLA_ISCSI=y
+CONFIG_SCSI_IPR=m
+CONFIG_SCSI_IPR_TRACE=y
+CONFIG_SCSI_IPR_DUMP=y
+CONFIG_SCSI_QLOGIC_1280=m
+CONFIG_SCSI_QLA_FC=m
+CONFIG_SCSI_QLA_ISCSI=m
 CONFIG_SCSI_LPFC=m
-CONFIG_SCSI_DC395x=y
-CONFIG_SCSI_DC390T=y
+CONFIG_SCSI_DC395x=m
+CONFIG_SCSI_DC390T=m
 # CONFIG_SCSI_DEBUG is not set
-# CONFIG_SCSI_SRP is not set
+CONFIG_SCSI_SRP=m
 
 #
 # PCMCIA SCSI adapter support
 #
-# CONFIG_PCMCIA_FDOMAIN is not set
+CONFIG_PCMCIA_FDOMAIN=m
 CONFIG_PCMCIA_QLOGIC=m
 CONFIG_PCMCIA_SYM53C500=m
 
 #
 # Serial ATA (prod) and Parallel ATA (experimental) drivers
 #
-CONFIG_ATA=y
+CONFIG_ATA=m
 # CONFIG_ATA_NONSTANDARD is not set
-CONFIG_SATA_AHCI=y
-CONFIG_SATA_SVW=y
-CONFIG_ATA_PIIX=y
-CONFIG_SATA_MV=y
-CONFIG_SATA_NV=y
-CONFIG_PDC_ADMA=y
-CONFIG_SATA_QSTOR=y
-CONFIG_SATA_PROMISE=y
-CONFIG_SATA_SX4=y
-CONFIG_SATA_SIL=y
-CONFIG_SATA_SIL24=y
-CONFIG_SATA_SIS=y
-CONFIG_SATA_ULI=y
-CONFIG_SATA_VIA=y
-CONFIG_SATA_VITESSE=y
-CONFIG_SATA_INTEL_COMBINED=y
-# CONFIG_PATA_ALI is not set
-# CONFIG_PATA_AMD is not set
-# CONFIG_PATA_ARTOP is not set
-# CONFIG_PATA_ATIIXP is not set
-# CONFIG_PATA_CMD64X is not set
-# CONFIG_PATA_CS5520 is not set
-# CONFIG_PATA_CS5530 is not set
-# CONFIG_PATA_CYPRESS is not set
-# CONFIG_PATA_EFAR is not set
-# CONFIG_ATA_GENERIC is not set
-# CONFIG_PATA_HPT366 is not set
-# CONFIG_PATA_HPT37X is not set
-# CONFIG_PATA_HPT3X2N is not set
-# CONFIG_PATA_HPT3X3 is not set
-# CONFIG_PATA_IT821X is not set
-# CONFIG_PATA_JMICRON is not set
-# CONFIG_PATA_TRIFLEX is not set
-# CONFIG_PATA_MARVELL is not set
-# CONFIG_PATA_MPIIX is not set
-# CONFIG_PATA_OLDPIIX is not set
-# CONFIG_PATA_NETCELL is not set
-# CONFIG_PATA_NS87410 is not set
-# CONFIG_PATA_OPTI is not set
-# CONFIG_PATA_OPTIDMA is not set
-# CONFIG_PATA_PCMCIA is not set
-# CONFIG_PATA_PDC_OLD is not set
-# CONFIG_PATA_RADISYS is not set
-# CONFIG_PATA_RZ1000 is not set
-# CONFIG_PATA_SC1200 is not set
-# CONFIG_PATA_SERVERWORKS is not set
-# CONFIG_PATA_PDC2027X is not set
-# CONFIG_PATA_SIL680 is not set
-# CONFIG_PATA_SIS is not set
-# CONFIG_PATA_VIA is not set
-# CONFIG_PATA_WINBOND is not set
+CONFIG_SATA_AHCI=m
+CONFIG_SATA_SVW=m
+CONFIG_ATA_PIIX=m
+CONFIG_SATA_MV=m
+CONFIG_SATA_NV=m
+CONFIG_PDC_ADMA=m
+CONFIG_SATA_QSTOR=m
+CONFIG_SATA_PROMISE=m
+CONFIG_SATA_SX4=m
+CONFIG_SATA_SIL=m
+CONFIG_SATA_SIL24=m
+CONFIG_SATA_SIS=m
+CONFIG_SATA_ULI=m
+CONFIG_SATA_VIA=m
+CONFIG_SATA_VITESSE=m
+CONFIG_PATA_ALI=m
+CONFIG_PATA_AMD=m
+CONFIG_PATA_ARTOP=m
+CONFIG_PATA_ATIIXP=m
+CONFIG_PATA_CMD64X=m
+CONFIG_PATA_CS5520=m
+CONFIG_PATA_CS5530=m
+CONFIG_PATA_CYPRESS=m
+CONFIG_PATA_EFAR=m
+CONFIG_ATA_GENERIC=m
+CONFIG_PATA_HPT366=m
+CONFIG_PATA_HPT37X=m
+CONFIG_PATA_HPT3X2N=m
+CONFIG_PATA_HPT3X3=m
+CONFIG_PATA_IT821X=m
+CONFIG_PATA_JMICRON=m
+CONFIG_PATA_TRIFLEX=m
+CONFIG_PATA_MARVELL=m
+CONFIG_PATA_MPIIX=m
+CONFIG_PATA_OLDPIIX=m
+CONFIG_PATA_NETCELL=m
+CONFIG_PATA_NS87410=m
+CONFIG_PATA_OPTI=m
+CONFIG_PATA_OPTIDMA=m
+CONFIG_PATA_PCMCIA=m
+CONFIG_PATA_PDC_OLD=m
+CONFIG_PATA_RADISYS=m
+CONFIG_PATA_RZ1000=m
+CONFIG_PATA_SC1200=m
+CONFIG_PATA_SERVERWORKS=m
+CONFIG_PATA_PDC2027X=m
+CONFIG_PATA_SIL680=m
+CONFIG_PATA_SIS=m
+CONFIG_PATA_VIA=m
+CONFIG_PATA_WINBOND=m
 
 #
 # Multi-device support (RAID and LVM)
@@ -880,9 +882,9 @@
 # Fusion MPT device support
 #
 CONFIG_FUSION=y
-CONFIG_FUSION_SPI=y
-CONFIG_FUSION_FC=y
-CONFIG_FUSION_SAS=y
+CONFIG_FUSION_SPI=m
+CONFIG_FUSION_FC=m
+CONFIG_FUSION_SAS=m
 CONFIG_FUSION_MAX_SGE=128
 # CONFIG_FUSION_CTL is not set
 # CONFIG_FUSION_LAN is not set
@@ -890,7 +892,7 @@
 #
 # IEEE 1394 (FireWire) support
 #
-CONFIG_IEEE1394=y
+CONFIG_IEEE1394=m
 
 #
 # Subsystem Options
@@ -908,13 +910,13 @@
 #
 # Texas Instruments PCILynx requires I2C
 #
-CONFIG_IEEE1394_OHCI1394=y
+CONFIG_IEEE1394_OHCI1394=m
 
 #
 # Protocol Drivers
 #
 # CONFIG_IEEE1394_VIDEO1394 is not set
-CONFIG_IEEE1394_SBP2=y
+CONFIG_IEEE1394_SBP2=m
 CONFIG_IEEE1394_ETH1394=m
 # CONFIG_IEEE1394_DV1394 is not set
 CONFIG_IEEE1394_RAWIO=m
@@ -1391,7 +1393,7 @@
 # CONFIG_LOGO_LINUX_VGA16 is not set
 CONFIG_LOGO_LINUX_CLUT224=y
 # CONFIG_BACKLIGHT_LCD_SUPPORT is not set
-CONFIG_BACKLIGHT_CLASS_DEVICE=m
+CONFIG_BACKLIGHT_CLASS_DEVICE=y
 CONFIG_BACKLIGHT_DEVICE=y
 
 #
@@ -1524,7 +1526,7 @@
 CONFIG_USB_ARCH_HAS_HCD=y
 CONFIG_USB_ARCH_HAS_OHCI=y
 CONFIG_USB_ARCH_HAS_EHCI=y
-CONFIG_USB=y
+CONFIG_USB=m
 # CONFIG_USB_DEBUG is not set
 
 #
@@ -1539,15 +1541,15 @@
 #
 # USB Host Controller Drivers
 #
-CONFIG_USB_EHCI_HCD=y
+CONFIG_USB_EHCI_HCD=m
 # CONFIG_USB_EHCI_SPLIT_ISO is not set
 # CONFIG_USB_EHCI_ROOT_HUB_TT is not set
 # CONFIG_USB_EHCI_TT_NEWSCHED is not set
 # CONFIG_USB_ISP116X_HCD is not set
-CONFIG_USB_OHCI_HCD=y
+CONFIG_USB_OHCI_HCD=m
 # CONFIG_USB_OHCI_BIG_ENDIAN is not set
 CONFIG_USB_OHCI_LITTLE_ENDIAN=y
-CONFIG_USB_UHCI_HCD=y
+CONFIG_USB_UHCI_HCD=m
 # CONFIG_USB_SL811_HCD is not set
 
 #
@@ -1563,7 +1565,7 @@
 #
 # may also be needed; see USB_STORAGE Help for more information
 #
-CONFIG_USB_STORAGE=y
+CONFIG_USB_STORAGE=m
 # CONFIG_USB_STORAGE_DEBUG is not set
 CONFIG_USB_STORAGE_DATAFAB=y
 CONFIG_USB_STORAGE_FREECOM=y
@@ -1580,10 +1582,16 @@
 #
 # USB Input Devices
 #
-CONFIG_USB_HID=y
+CONFIG_USB_HID=m
 CONFIG_USB_HIDINPUT_POWERBOOK=y
 # CONFIG_HID_FF is not set
 CONFIG_USB_HIDDEV=y
+
+#
+# USB HID Boot Protocol drivers
+#
+# CONFIG_USB_KBD is not set
+# CONFIG_USB_MOUSE is not set
 # CONFIG_USB_AIPTEK is not set
 # CONFIG_USB_WACOM is not set
 # CONFIG_USB_ACECAD is not set
@@ -1785,21 +1793,24 @@
 #
 # Firmware Drivers
 #
-# CONFIG_EDD is not set
+CONFIG_EDD=m
 # CONFIG_DELL_RBU is not set
 # CONFIG_DCDBAS is not set
 
 #
 # File systems
 #
-CONFIG_EXT2_FS=y
+CONFIG_EXT2_FS=m
 # CONFIG_EXT2_FS_XATTR is not set
 # CONFIG_EXT2_FS_XIP is not set
-CONFIG_EXT3_FS=y
+CONFIG_EXT3_FS=m
 # CONFIG_EXT3_FS_XATTR is not set
-# CONFIG_EXT4DEV_FS is not set
-CONFIG_JBD=y
+CONFIG_EXT4DEV_FS=m
+# CONFIG_EXT4DEV_FS_XATTR is not set
+CONFIG_JBD=m
 # CONFIG_JBD_DEBUG is not set
+CONFIG_JBD2=m
+# CONFIG_JBD2_DEBUG is not set
 CONFIG_REISERFS_FS=m
 # CONFIG_REISERFS_CHECK is not set
 CONFIG_REISERFS_PROC_INFO=y
@@ -1830,10 +1841,10 @@
 #
 # CD-ROM/DVD Filesystems
 #
-CONFIG_ISO9660_FS=y
+CONFIG_ISO9660_FS=m
 CONFIG_JOLIET=y
 CONFIG_ZISOFS=y
-CONFIG_ZISOFS_FS=y
+CONFIG_ZISOFS_FS=m
 CONFIG_UDF_FS=m
 CONFIG_UDF_NLS=y
 
@@ -2043,7 +2054,7 @@
 CONFIG_CRC16=m
 CONFIG_CRC32=y
 CONFIG_LIBCRC32C=y
-CONFIG_ZLIB_INFLATE=y
+CONFIG_ZLIB_INFLATE=m
 CONFIG_ZLIB_DEFLATE=m
 CONFIG_TEXTSEARCH=y
 CONFIG_TEXTSEARCH_KMP=m




More information about the livecd mailing list