diff options
| author | phk <phk@FreeBSD.org> | 1996-09-11 19:53:45 +0000 |
|---|---|---|
| committer | phk <phk@FreeBSD.org> | 1996-09-11 19:53:45 +0000 |
| commit | 5c73cf79b9ada3b134cd4f6596bab80a44095809 (patch) | |
| tree | d5257995f3b81705516e8902b3983222ab017637 /sys/amd64 | |
| parent | a04f5409f43330b7bca05bbbf1cb3a041b7c1e26 (diff) | |
| download | FreeBSD-src-5c73cf79b9ada3b134cd4f6596bab80a44095809.zip FreeBSD-src-5c73cf79b9ada3b134cd4f6596bab80a44095809.tar.gz | |
Make userconfig two (default: on) options:
USERCONFIG to enable
VISUAL_USERCONFIG to get the gui stuff too.
Requested by: pst
Diffstat (limited to 'sys/amd64')
| -rw-r--r-- | sys/amd64/amd64/machdep.c | 7 | ||||
| -rw-r--r-- | sys/amd64/conf/GENERIC | 4 |
2 files changed, 9 insertions, 2 deletions
diff --git a/sys/amd64/amd64/machdep.c b/sys/amd64/amd64/machdep.c index abc6d0e..58c9cf7 100644 --- a/sys/amd64/amd64/machdep.c +++ b/sys/amd64/amd64/machdep.c @@ -35,7 +35,7 @@ * SUCH DAMAGE. * * from: @(#)machdep.c 7.4 (Berkeley) 6/3/91 - * $Id: machdep.c,v 1.202 1996/09/06 23:07:03 phk Exp $ + * $Id: machdep.c,v 1.203 1996/09/10 23:06:58 bde Exp $ */ #include "npx.h" @@ -44,6 +44,7 @@ #include "opt_bounce.h" #include "opt_machdep.h" #include "opt_perfmon.h" +#include "opt_userconfig.h" #include <sys/param.h> #include <sys/systm.h> @@ -380,8 +381,12 @@ again: callout[i-1].c_next = &callout[i]; if (boothowto & RB_CONFIG) { +#ifdef USERCONFIG userconfig(); cninit(); /* the preferred console may have changed */ +#else + printf("Sorry! no userconfig in this kernel\n"); +#endif } #ifdef BOUNCE_BUFFERS diff --git a/sys/amd64/conf/GENERIC b/sys/amd64/conf/GENERIC index f8c6a98..88327db 100644 --- a/sys/amd64/conf/GENERIC +++ b/sys/amd64/conf/GENERIC @@ -11,7 +11,7 @@ # device lines is present in the ./LINT configuration file. If you are # in doubt as to the purpose or necessity of a line, check first in LINT. # -# $Id: GENERIC,v 1.74 1996/07/11 11:18:45 jkh Exp $ +# $Id: GENERIC,v 1.75 1996/08/27 16:25:53 wosch Exp $ machine "i386" cpu "I386_CPU" @@ -33,6 +33,8 @@ options SCSI_DELAY=15 #Be pessimistic about Joe SCSI device options BOUNCE_BUFFERS #include support for DMA bounce buffers options UCONSOLE #Allow users to grab the console options FAILSAFE #Be conservative +options USERCONFIG #boot -c editor +options VISUAL_USERCONFIG #visual boot -c editor config kernel root on wd0 |
