diff options
author | jkh <jkh@FreeBSD.org> | 1996-11-09 18:12:17 +0000 |
---|---|---|
committer | jkh <jkh@FreeBSD.org> | 1996-11-09 18:12:17 +0000 |
commit | d21e76e0ba303fbf5137410dcd94aa5ca47c06e5 (patch) | |
tree | 2d55fb7d1c489e4f8d1d0f71d50c8f4026b37582 /usr.sbin/sysinstall/options.c | |
parent | d30fd798cea507d4c9bd782fc86fe32059dabc4c (diff) | |
download | FreeBSD-src-d21e76e0ba303fbf5137410dcd94aa5ca47c06e5.zip FreeBSD-src-d21e76e0ba303fbf5137410dcd94aa5ca47c06e5.tar.gz |
1. Take out console setup in options now that Joerg has moved it into
the main menu.
2. Conditionalized a few small things which needed it.
3. Put PC98 X servers in their own menu, there are so many of them now.
4. Rampaged on the menus.c file in general, reformatting and cleaning up.
Diffstat (limited to 'usr.sbin/sysinstall/options.c')
-rw-r--r-- | usr.sbin/sysinstall/options.c | 29 |
1 files changed, 1 insertions, 28 deletions
diff --git a/usr.sbin/sysinstall/options.c b/usr.sbin/sysinstall/options.c index e9336dd..c5465a7 100644 --- a/usr.sbin/sysinstall/options.c +++ b/usr.sbin/sysinstall/options.c @@ -4,7 +4,7 @@ * This is probably the last attempt in the `sysinstall' line, the next * generation being slated for what's essentially a complete rewrite. * - * $Id: options.c,v 1.44 1996/10/02 01:30:37 jkh Exp $ + * $Id: options.c,v 1.45 1996/11/07 08:03:27 jkh Exp $ * * Copyright (c) 1995 * Jordan Hubbard. All rights reserved. @@ -93,31 +93,6 @@ mediaCheck(Option opt) return "<not yet set>"; } -static char * -consoleCheck(Option opt) -{ - static char opts[40]; - char *cp; - - opts[0] = '\0'; - cp = variable_get("saver"); - sprintf(&opts[strlen(opts)], "%s/", cp ?: "std"); - cp = variable_get("scrnmap"); - sprintf(&opts[strlen(opts)], "%s/", cp ?: "std"); - cp = variable_get("font8x8"); - sprintf(&opts[strlen(opts)], "%s", cp ?: "std"); - return opts; -} - -static int -consoleGetType(dialogMenuItem *self) -{ - int i; - - i = dmenuOpenSimple(&MenuSyscons, FALSE) ? DITEM_SUCCESS : DITEM_FAILURE; - return i | DITEM_RECREATE; -} - #define TAPE_PROMPT "Please enter the tape block size in 512 byte blocks:" #define RELNAME_PROMPT "Please specify the release you wish to load or\n\"none\" for a generic release install:" #define BPKG_PROMPT "Please specify the name of the HTML browser package:" @@ -153,8 +128,6 @@ static Option Options[] = { OPT_IS_VAR, BBIN_PROMPT, VAR_BROWSER_BINARY, varCheck }, { "Media Type", "The current installation media type.", OPT_IS_FUNC, mediaGetType, VAR_MEDIA_TYPE, mediaCheck }, -{ "Console Config", "Keyboard and font configuration.", - OPT_IS_FUNC, consoleGetType, "System console", consoleCheck }, { "Package Temp", "The directory where package temporary files should go", OPT_IS_VAR, PKG_PROMPT, VAR_PKG_TMPDIR, varCheck }, { "Use Defaults", "Reset all values to startup defaults", |