Re: CVS commit: src/distrib/utils/sysinst

[Izumi Tsutsui <tsutsui%ceres.dti.ne.jp@localhost>]

ad%NetBSD.org@localhost wrote:

> On Sat, Apr 04, 2009 at 03:04:43PM +0200, Martin Husemann wrote:
> 
> > On Sat, Apr 04, 2009 at 09:43:46PM +0900, Izumi Tsutsui wrote:
> > > In any case, __HAVE_UFS2_BOOT in types.h seems ambiguous for me.
> > > Isn't it better to have some other macro in sysinst/arch/${MACHINE}/md.h ?
> > 
> > I agree, it does not belong in types.h.
> 
> Feel free to change it.

Like this?
(no idea how we can reject FFSv2 for root on the menu if !HAVE_UFS2_BOOT)


Index: sys/arch/amd64/include/types.h
===================================================================
RCS file: /cvsroot/src/sys/arch/amd64/include/types.h,v
retrieving revision 1.29
diff -u -r1.29 types.h
--- sys/arch/amd64/include/types.h      4 Apr 2009 10:36:09 -0000       1.29
+++ sys/arch/amd64/include/types.h      4 Apr 2009 16:09:52 -0000
@@ -76,7 +76,6 @@
 #define        __HAVE_ATOMIC64_OPS
 #define        __HAVE_ATOMIC_AS_MEMBAR
 #define __HAVE_CPU_LWP_SETPRIVATE
-#define        __HAVE_UFS2_BOOT
 
 #ifdef _KERNEL_OPT
 #include "opt_xen.h"
Index: sys/arch/i386/include/types.h
===================================================================
RCS file: /cvsroot/src/sys/arch/i386/include/types.h,v
retrieving revision 1.62
diff -u -r1.62 types.h
--- sys/arch/i386/include/types.h       4 Apr 2009 10:36:08 -0000       1.62
+++ sys/arch/i386/include/types.h       4 Apr 2009 16:09:52 -0000
@@ -84,7 +84,6 @@
 #define        __HAVE_ATOMIC64_OPS
 #define        __HAVE_ATOMIC_AS_MEMBAR
 #define        __HAVE_CPU_LWP_SETPRIVATE
-#define        __HAVE_UFS2_BOOT
 
 #if defined(_KERNEL)
 #define __HAVE_RAS
Index: distrib/utils/sysinst/bsddisklabel.c
===================================================================
RCS file: /cvsroot/src/distrib/utils/sysinst/bsddisklabel.c,v
retrieving revision 1.49
diff -u -r1.49 bsddisklabel.c
--- distrib/utils/sysinst/bsddisklabel.c        4 Apr 2009 11:34:09 -0000       
1.49
+++ distrib/utils/sysinst/bsddisklabel.c        4 Apr 2009 16:09:53 -0000
@@ -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: distrib/utils/sysinst/arch/amd64/md.h
===================================================================
RCS file: /cvsroot/src/distrib/utils/sysinst/arch/amd64/md.h,v
retrieving revision 1.23
diff -u -r1.23 md.h
--- distrib/utils/sysinst/arch/amd64/md.h       4 Apr 2009 11:04:28 -0000       
1.23
+++ distrib/utils/sysinst/arch/amd64/md.h       4 Apr 2009 16:09:53 -0000
@@ -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: distrib/utils/sysinst/arch/i386/md.h
===================================================================
RCS file: /cvsroot/src/distrib/utils/sysinst/arch/i386/md.h,v
retrieving revision 1.64
diff -u -r1.64 md.h
--- distrib/utils/sysinst/arch/i386/md.h        4 Apr 2009 11:04:28 -0000       
1.64
+++ distrib/utils/sysinst/arch/i386/md.h        4 Apr 2009 16:09:53 -0000
@@ -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
 

---
Izumi Tsutsui