Module Name: src
Committed By: christos
Date: Mon Jan 16 18:46:20 UTC 2012
Modified Files:
src/sys/arch/i386/stand/boot: Makefile.boot conf.c
Log Message:
PR/45796: Evgeniy Ivanov minixfs3 support.
To generate a diff of this commit:
cvs rdiff -u -r1.56 -r1.57 src/sys/arch/i386/stand/boot/Makefile.boot
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/i386/stand/boot/conf.c
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/stand/boot/Makefile.boot
diff -u src/sys/arch/i386/stand/boot/Makefile.boot:1.56 src/sys/arch/i386/stand/boot/Makefile.boot:1.57
--- src/sys/arch/i386/stand/boot/Makefile.boot:1.56 Sun Dec 25 01:09:09 2011
+++ src/sys/arch/i386/stand/boot/Makefile.boot Mon Jan 16 13:46:20 2012
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.boot,v 1.56 2011/12/25 06:09:09 tsutsui Exp $
+# $NetBSD: Makefile.boot,v 1.57 2012/01/16 18:46:20 christos Exp $
S= ${.CURDIR}/../../../../..
@@ -70,6 +70,7 @@ CPPFLAGS+= -DSUPPORT_CD9660
CPPFLAGS+= -DSUPPORT_USTARFS
CPPFLAGS+= -DSUPPORT_DOSFS
CPPFLAGS+= -DSUPPORT_EXT2FS
+#CPPFLAGS+= -DSUPPORT_MINIXFS3
CPPFLAGS+= -DPASS_BIOSGEOM
CPPFLAGS+= -DPASS_MEMMAP
#CPPFLAGS+= -DBOOTPASSWD
Index: src/sys/arch/i386/stand/boot/conf.c
diff -u src/sys/arch/i386/stand/boot/conf.c:1.5 src/sys/arch/i386/stand/boot/conf.c:1.6
--- src/sys/arch/i386/stand/boot/conf.c:1.5 Sat Apr 5 14:21:34 2008
+++ src/sys/arch/i386/stand/boot/conf.c Mon Jan 16 13:46:20 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: conf.c,v 1.5 2008/04/05 18:21:34 tsutsui Exp $ */
+/* $NetBSD: conf.c,v 1.6 2012/01/16 18:46:20 christos Exp $ */
/*
* Copyright (c) 1997
@@ -36,6 +36,9 @@
#ifdef SUPPORT_EXT2FS
#include <lib/libsa/ext2fs.h>
#endif
+#ifdef SUPPORT_MINIXFS3
+#include <lib/libsa/minixfs3.h>
+#endif
#ifdef SUPPORT_USTARFS
#include <lib/libsa/ustarfs.h>
#endif
@@ -66,6 +69,9 @@ struct fs_ops file_system[] = {
#ifdef SUPPORT_EXT2FS
FS_OPS(ext2fs),
#endif
+#ifdef SUPPORT_MINIXFS3
+ FS_OPS(minixfs3),
+#endif
#ifdef SUPPORT_DOSFS
FS_OPS(dosfs),
#endif
