[src/trunk]: src/distrib/utils/sysinst Add a NO_LFS define to force support f...

[martin <martin%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/daa2a2af5285
branches:  trunk
changeset: 753666:daa2a2af5285
user:      martin <martin%NetBSD.org@localhost>
date:      Mon Apr 05 22:53:02 2010 +0000

description:
Add a NO_LFS define to force support for LFS in sysinst off, even if
the install media provides the utilities. Set this for sparc64 for now,
since the bootblocks don't deal with the default LFS parameters used
by sysinst.

diffstat:

 distrib/utils/sysinst/arch/sparc64/md.h |  5 ++++-
 distrib/utils/sysinst/util.c            |  6 +++++-
 2 files changed, 9 insertions(+), 2 deletions(-)

diffs (40 lines):

diff -r 840094ddff1b -r daa2a2af5285 distrib/utils/sysinst/arch/sparc64/md.h
--- a/distrib/utils/sysinst/arch/sparc64/md.h   Mon Apr 05 21:35:36 2010 +0000
+++ b/distrib/utils/sysinst/arch/sparc64/md.h   Mon Apr 05 22:53:02 2010 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: md.h,v 1.17 2010/03/13 08:36:06 mrg Exp $      */
+/*     $NetBSD: md.h,v 1.18 2010/04/05 22:53:02 martin Exp $   */
 
 /*
  * Copyright 1997 Piermont Information Systems Inc.
@@ -66,6 +66,9 @@
 /* allow using tmpfs for /tmp instead of mfs */
 #define HAVE_TMPFS
 
+/* disable LFS support, despite providing the lfs utilities */
+#define        NO_LFS
+
 /*
  * Default filesets to fetch and install during installation
  * or upgrade.
diff -r 840094ddff1b -r daa2a2af5285 distrib/utils/sysinst/util.c
--- a/distrib/utils/sysinst/util.c      Mon Apr 05 21:35:36 2010 +0000
+++ b/distrib/utils/sysinst/util.c      Mon Apr 05 22:53:02 2010 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: util.c,v 1.164 2010/03/30 20:09:25 martin Exp $        */
+/*     $NetBSD: util.c,v 1.165 2010/04/05 22:53:02 martin Exp $        */
 
 /*
  * Copyright 1997 Piermont Information Systems Inc.
@@ -1479,7 +1479,11 @@
 check_lfs_progs(void)
 {
 
+#ifndef NO_LFS
        return (access("/sbin/fsck_lfs", X_OK) == 0 &&
                access("/sbin/mount_lfs", X_OK) == 0 &&
                access("/sbin/newfs_lfs", X_OK) == 0);
+#else
+       return 0;
+#endif
 }