Module Name: src
Committed By: uebayasi
Date: Sat Oct 30 05:02:28 UTC 2010
Modified Files:
src/sys/arch/amd64/conf [uebayasi-xip]: XIP
src/sys/arch/i386/conf [uebayasi-xip]: XIP
Log Message:
xmd(4) uses a conflicting symbol "md_root_image" with md(4).
Exclude md(4) where xmd(4) is used.
XXX In the long run mdsetimage(8) must die.
To generate a diff of this commit:
cvs rdiff -u -r1.1.2.1 -r1.1.2.2 src/sys/arch/amd64/conf/XIP
cvs rdiff -u -r1.1.2.1 -r1.1.2.2 src/sys/arch/i386/conf/XIP
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/amd64/conf/XIP
diff -u src/sys/arch/amd64/conf/XIP:1.1.2.1 src/sys/arch/amd64/conf/XIP:1.1.2.2
--- src/sys/arch/amd64/conf/XIP:1.1.2.1 Fri Aug 27 09:41:51 2010
+++ src/sys/arch/amd64/conf/XIP Sat Oct 30 05:02:28 2010
@@ -1,8 +1,9 @@
-# $NetBSD: XIP,v 1.1.2.1 2010/08/27 09:41:51 uebayasi Exp $
+# $NetBSD: XIP,v 1.1.2.2 2010/10/30 05:02:28 uebayasi Exp $
include "arch/amd64/conf/GENERIC"
options XIP
+no pseudo-device md
pseudo-device xmd 1 # XIP memory disk device (ramdisk)
options XMD_ROOT_SIZE=10240 # 5MB
Index: src/sys/arch/i386/conf/XIP
diff -u src/sys/arch/i386/conf/XIP:1.1.2.1 src/sys/arch/i386/conf/XIP:1.1.2.2
--- src/sys/arch/i386/conf/XIP:1.1.2.1 Fri Aug 20 07:04:38 2010
+++ src/sys/arch/i386/conf/XIP Sat Oct 30 05:02:28 2010
@@ -1,9 +1,10 @@
-# $NetBSD: XIP,v 1.1.2.1 2010/08/20 07:04:38 uebayasi Exp $
+# $NetBSD: XIP,v 1.1.2.2 2010/10/30 05:02:28 uebayasi Exp $
include "arch/i386/conf/GENERIC"
file-system FFS # UFS
options XIP
+no pseudo-device md
pseudo-device xmd 1 # XIP memory disk device (ramdisk)
options XMD_ROOT_SIZE=10240 # 5MB
