Module Name: src
Committed By: tsutsui
Date: Sun Apr 5 00:50:52 UTC 2009
Modified Files:
src/distrib/utils/sysinst: bsddisklabel.c
src/distrib/utils/sysinst/arch/amd64: md.h
src/distrib/utils/sysinst/arch/i386: md.h
Log Message:
- introduce machine dependent DEFAULT_UFS2 and HAVE_UFS2_BOOT flags in md.h
- use those flags to change default ffs type, rather than adding
__HAVE_UFS2_BOOT in <machine/types.h>
Okay'ed by martin@, briefly tested on i386.
To generate a diff of this commit:
cvs rdiff -u -r1.49 -r1.50 src/distrib/utils/sysinst/bsddisklabel.c
cvs rdiff -u -r1.23 -r1.24 src/distrib/utils/sysinst/arch/amd64/md.h
cvs rdiff -u -r1.64 -r1.65 src/distrib/utils/sysinst/arch/i386/md.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/utils/sysinst/bsddisklabel.c
diff -u src/distrib/utils/sysinst/bsddisklabel.c:1.49 src/distrib/utils/sysinst/bsddisklabel.c:1.50
--- src/distrib/utils/sysinst/bsddisklabel.c:1.49 Sat Apr 4 11:34:09 2009
+++ src/distrib/utils/sysinst/bsddisklabel.c Sun Apr 5 00:50:51 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: bsddisklabel.c,v 1.49 2009/04/04 11:34:09 ad Exp $ */
+/* $NetBSD: bsddisklabel.c,v 1.50 2009/04/05 00:50:51 tsutsui Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -131,8 +131,11 @@
/* Default to logging, UFS2. */
if (p->pi_fstype == FS_BSDFFS) {
p->pi_flags |= PIF_LOG;
-#ifdef __HAVE_UFS2_BOOT
- p->pi_flags |= PIF_FFSv2;
+#ifdef DEFAULT_UFS2
+#ifndef HAVE_UFS2_BOOT
+ if (strcmp(mountpt, "/") != 0)
+#endif
+ p->pi_flags |= PIF_FFSv2;
#endif
}
}
Index: src/distrib/utils/sysinst/arch/amd64/md.h
diff -u src/distrib/utils/sysinst/arch/amd64/md.h:1.23 src/distrib/utils/sysinst/arch/amd64/md.h:1.24
--- src/distrib/utils/sysinst/arch/amd64/md.h:1.23 Sat Apr 4 11:04:28 2009
+++ src/distrib/utils/sysinst/arch/amd64/md.h Sun Apr 5 00:50:52 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: md.h,v 1.23 2009/04/04 11:04:28 ad Exp $ */
+/* $NetBSD: md.h,v 1.24 2009/04/05 00:50:52 tsutsui Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -53,6 +53,10 @@
#define DEFUSRSIZE 0
#define DEFSWAPSIZE (-1)
+/* use UFS2 by default for ffs */
+#define DEFAULT_UFS2
+#define HAVE_UFS2_BOOT
+
/* Megs required for a full X installation. */
#define XNEEDMB 50
Index: src/distrib/utils/sysinst/arch/i386/md.h
diff -u src/distrib/utils/sysinst/arch/i386/md.h:1.64 src/distrib/utils/sysinst/arch/i386/md.h:1.65
--- src/distrib/utils/sysinst/arch/i386/md.h:1.64 Sat Apr 4 11:04:28 2009
+++ src/distrib/utils/sysinst/arch/i386/md.h Sun Apr 5 00:50:52 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: md.h,v 1.64 2009/04/04 11:04:28 ad Exp $ */
+/* $NetBSD: md.h,v 1.65 2009/04/05 00:50:52 tsutsui Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -54,6 +54,10 @@
#define DEFSWAPSIZE (-1)
#define DEFROOTSIZE 32
+/* use UFS2 by default for ffs */
+#define DEFAULT_UFS2
+#define HAVE_UFS2_BOOT
+
/* Megs required for a full X installation. */
#define XNEEDMB 50
