Module Name: src
Committed By: jym
Date: Thu Feb 10 16:49:19 UTC 2011
Modified Files:
src/sys/arch/i386/conf: INSTALL
Log Message:
For i386, include MONOLITHIC for INSTALL rather than GENERIC. While here,
remove drm drivers, we don't need them for install.
i386 GENERIC has FFS and ELF support compiled as modules, so we hit
an interesting "chicken-egg" situation when the kernel attempts to mount
a ffs ramdisk, while the module might be contained inside... the ramdisk.
Interesting scenario: my netbsd-INSTALL.gz testing involved a QEMU image
which already contained an installed system, including modules. So the
bootloader was able to get the ffs.kmod, and lead to a successful mount
of the ramdisk.
Caught off-guard by gson@ automated builds... Erf. My fondest apologies.
Lesson learnt. Hopefully, this will unbreak the floppy install.
Waiting for the release build to finish...
To generate a diff of this commit:
cvs rdiff -u -r1.327 -r1.328 src/sys/arch/i386/conf/INSTALL
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/i386/conf/INSTALL
diff -u src/sys/arch/i386/conf/INSTALL:1.327 src/sys/arch/i386/conf/INSTALL:1.328
--- src/sys/arch/i386/conf/INSTALL:1.327 Thu Feb 10 00:43:19 2011
+++ src/sys/arch/i386/conf/INSTALL Thu Feb 10 16:49:19 2011
@@ -1,15 +1,26 @@
-# $NetBSD: INSTALL,v 1.327 2011/02/10 00:43:19 jym Exp $
+# $NetBSD: INSTALL,v 1.328 2011/02/10 16:49:19 jym Exp $
#
# INSTALL - Installation kernel.
#
# This kernel is derived from GENERIC with additional memory disk
# options.
-include "arch/i386/conf/GENERIC"
+include "arch/i386/conf/MONOLITHIC"
-#ident "INSTALL-$Revision: 1.327 $"
+#ident "INSTALL-$Revision: 1.328 $"
no options MEMORY_DISK_DYNAMIC
options MEMORY_DISK_IS_ROOT # force root on memory disk
options MEMORY_DISK_SERVER=0 # no userspace memory disk support
options MEMORY_DISK_ROOT_SIZE=10000 # size of memory disk, in blocks
+options MEMORY_DISK_RBFLAGS=RB_SINGLE # boot in single-user mode
+
+# DRI driver
+no i915drm* at vga? # Intel i915, i945 DRM driver
+no mach64drm* at vga? # mach64 (3D Rage Pro, Rage) DRM driver
+no mgadrm* at vga? # Matrox G[24]00, G[45]50 DRM driver
+no r128drm* at vga? # ATI Rage 128 DRM driver
+no radeondrm* at vga? # ATI Radeon DRM driver
+no savagedrm* at vga? # S3 Savage DRM driver
+no sisdrm* at vga? # SiS DRM driver
+no tdfxdrm* at vga? # 3dfx (voodoo) DRM driver
