diff options
author | jkh <jkh@FreeBSD.org> | 1996-04-07 03:52:36 +0000 |
---|---|---|
committer | jkh <jkh@FreeBSD.org> | 1996-04-07 03:52:36 +0000 |
commit | 61af07d0231e53139c2d8c49081a0f43da46af74 (patch) | |
tree | a289c0714788a15dfb0bcf3c9030a3425c5072c3 /release/sysinstall/config.c | |
parent | 318997a39fbec1e8347a1ff0431ca2713799510f (diff) | |
download | FreeBSD-src-61af07d0231e53139c2d8c49081a0f43da46af74.zip FreeBSD-src-61af07d0231e53139c2d8c49081a0f43da46af74.tar.gz |
Major surgery.
1. Use new dialog menu hacks (no strings, just arrays of dialogMenuItem structs)
so that I can create composite menus with radio/checkbox/... items in them,
removing some long-standing UI bogons in various menus. This work isn't
finished yet, but will be done in two phases. This is phase one.
2. Remove all the script installation stuff. I never got time to document it,
it was arcane and it just complicated much of the code. There are better
ways of doing this if I want to do auto-driven installations later.
3. Remove much dead code and otherwise attempt to remove as much historical
grot as possible so that this code is easier to hack on. This is also
a two-stage process, phase one of which is now complete.
Diffstat (limited to 'release/sysinstall/config.c')
-rw-r--r-- | release/sysinstall/config.c | 30 |
1 files changed, 22 insertions, 8 deletions
diff --git a/release/sysinstall/config.c b/release/sysinstall/config.c index 40622be..5609ad0 100644 --- a/release/sysinstall/config.c +++ b/release/sysinstall/config.c @@ -4,7 +4,7 @@ * This is probably the last program in the `sysinstall' line - the next * generation being essentially a complete rewrite. * - * $Id: config.c,v 1.21 1996/03/21 09:30:08 jkh Exp $ + * $Id: config.c,v 1.22 1996/03/24 18:57:34 joerg Exp $ * * Copyright (c) 1995 * Jordan Hubbard. All rights reserved. @@ -326,18 +326,32 @@ configSysconfig(void) } int -configSaverTimeout(char *str) +configSaverTimeout(dialogMenuItem *self) { - return variable_get_value(VAR_BLANKTIME, "Enter time-out period in seconds for screen saver") - ? RET_SUCCESS : RET_FAIL; + return variable_get_value(VAR_BLANKTIME, "Enter time-out period in seconds for screen saver") ? + RET_SUCCESS : RET_FAIL; } int -configNTP(char *str) +configNTP(dialogMenuItem *self) { return variable_get_value(VAR_NTPDATE, "Enter the name of an NTP server") ? RET_SUCCESS : RET_FAIL; } +int +configXFree86(dialogMenuItem *self) +{ + if (file_executable("/usr/X11R6/bin/xf86config")) { + systemExecute("/usr/X11R6/bin/xf86config"); + return RET_SUCCESS; + } + else { + msgConfirm("XFree86 does not appear to be installed! Please install\n" + "The XFree86 distribution before attempting to configure it."); + return RET_FAIL; + } +} + void configResolv(void) { @@ -398,7 +412,7 @@ skip: } int -configRoutedFlags(char *str) +configRoutedFlags(dialogMenuItem *self) { return variable_get_value(VAR_ROUTEDFLAGS, "Specify the flags for routed; -q is the default, -s is\n" @@ -406,7 +420,7 @@ configRoutedFlags(char *str) } int -configPackages(char *str) +configPackages(dialogMenuItem *self) { static PkgNode top, plist; static Boolean index_initted = FALSE; @@ -483,7 +497,7 @@ configPackages(char *str) } int -configPorts(char *str) +configPorts(dialogMenuItem *self) { char *cp, *dist = NULL; /* Shut up compiler */ |