Module Name: src
Committed By: martin
Date: Mon Apr 5 22:53:02 UTC 2010
Modified Files:
src/distrib/utils/sysinst: util.c
src/distrib/utils/sysinst/arch/sparc64: md.h
Log Message:
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.
To generate a diff of this commit:
cvs rdiff -u -r1.164 -r1.165 src/distrib/utils/sysinst/util.c
cvs rdiff -u -r1.17 -r1.18 src/distrib/utils/sysinst/arch/sparc64/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/util.c
diff -u src/distrib/utils/sysinst/util.c:1.164 src/distrib/utils/sysinst/util.c:1.165
--- src/distrib/utils/sysinst/util.c:1.164 Tue Mar 30 20:09:25 2010
+++ src/distrib/utils/sysinst/util.c Mon Apr 5 22:53:02 2010
@@ -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
}
Index: src/distrib/utils/sysinst/arch/sparc64/md.h
diff -u src/distrib/utils/sysinst/arch/sparc64/md.h:1.17 src/distrib/utils/sysinst/arch/sparc64/md.h:1.18
--- src/distrib/utils/sysinst/arch/sparc64/md.h:1.17 Sat Mar 13 08:36:06 2010
+++ src/distrib/utils/sysinst/arch/sparc64/md.h Mon Apr 5 22:53:02 2010
@@ -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.
