Allow "the forcing of root on md0a to single user" to be overriden by using

options MEMORY_RBFLAGS=0    (XXX forcing to single user needs to die).
This commit is contained in:
matt 2003-02-03 23:02:42 +00:00
parent 373f926356
commit a53ed95ee8
2 changed files with 9 additions and 4 deletions

View File

@ -1,4 +1,4 @@
# $NetBSD: files,v 1.593 2003/01/31 21:57:23 tsutsui Exp $
# $NetBSD: files,v 1.594 2003/02/03 23:02:42 matt Exp $
# @(#)files.newconf 7.5 (Berkeley) 5/10/93
@ -158,6 +158,7 @@ defflag opt_kstack.h KSTACK_CHECK_MAGIC
defflag opt_md.h MEMORY_DISK_HOOKS MEMORY_DISK_IS_ROOT
MEMORY_DISK_DYNAMIC
defparam opt_md.h MEMORY_DISK_SERVER MEMORY_DISK_ROOT_SIZE
MEMORY_RBFLAGS
# Support for hardware performance monitoring counters
#

View File

@ -1,4 +1,4 @@
/* $NetBSD: md_root.c,v 1.6 2002/04/02 05:30:52 lukem Exp $ */
/* $NetBSD: md_root.c,v 1.7 2003/02/03 23:02:43 matt Exp $ */
/*-
* Copyright (c) 1996 The NetBSD Foundation, Inc.
@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: md_root.c,v 1.6 2002/04/02 05:30:52 lukem Exp $");
__KERNEL_RCSID(0, "$NetBSD: md_root.c,v 1.7 2003/02/03 23:02:43 matt Exp $");
#include "opt_md.h"
@ -59,6 +59,10 @@ char *md_root_image;
#endif
#define ROOTBYTES (MEMORY_DISK_ROOT_SIZE << DEV_BSHIFT)
#ifndef MEMORY_RBFLAGS
#define MEMORY_RBFLAGS RB_SINGLE /* force single user */
#endif
/*
* This array will be patched to contain a file-system image.
* See the program mdsetimage(8) for details.
@ -103,6 +107,6 @@ md_open_hook(int unit, struct md_conf *md)
if (unit == 0) {
/* The root ramdisk only works single-user. */
boothowto |= RB_SINGLE;
boothowto |= MEMORY_RBFLAGS;
}
}