summaryrefslogtreecommitdiffstats
path: root/release/sysinstall/config.c
diff options
context:
space:
mode:
authorjkh <jkh@FreeBSD.org>1996-11-07 08:03:29 +0000
committerjkh <jkh@FreeBSD.org>1996-11-07 08:03:29 +0000
commit0096c37cc7c3e72bbdd505ef949ba848b2f8b1ce (patch)
treed2361de972591eca60efa43fc0e211301bfd2cb9 /release/sysinstall/config.c
parente87ca66bb9d80209e28563e7dba5263da1ccc5a8 (diff)
downloadFreeBSD-src-0096c37cc7c3e72bbdd505ef949ba848b2f8b1ce.zip
FreeBSD-src-0096c37cc7c3e72bbdd505ef949ba848b2f8b1ce.tar.gz
Joerg's changes to add screen font and screenmap setting.
Some changes of my own to make screen saver configuration a little more sane, and also make it easier to get to the keyboard/screen setup from the options menu.
Diffstat (limited to 'release/sysinstall/config.c')
-rw-r--r--release/sysinstall/config.c13
1 files changed, 4 insertions, 9 deletions
diff --git a/release/sysinstall/config.c b/release/sysinstall/config.c
index fbed13f..cb28a32 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.52 1996/11/04 12:56:17 jkh Exp $
+ * $Id: config.c,v 1.53 1996/11/04 17:42:04 jkh Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
@@ -335,13 +335,8 @@ configSaver(dialogMenuItem *self)
int
configSaverTimeout(dialogMenuItem *self)
{
- if (variable_get(VAR_BLANKTIME)) {
- variable_unset(VAR_BLANKTIME);
- return DITEM_SUCCESS | DITEM_REDRAW;
- }
- else
- return (variable_get_value(VAR_BLANKTIME, "Enter time-out period in seconds for screen saver")
- ? DITEM_SUCCESS : DITEM_FAILURE) | DITEM_RESTORE;
+ return (variable_get_value(VAR_BLANKTIME, "Enter time-out period in seconds for screen saver") ?
+ DITEM_SUCCESS : DITEM_FAILURE) | DITEM_RESTORE;
}
int
@@ -380,7 +375,7 @@ configResolv(void)
FILE *fp;
char *cp, *dp, *hp;
- if (!RunningAsInit && file_readable("/etc/resolv.conf"))
+ if (!RunningAsInit || file_readable("/etc/resolv.conf"))
return;
if (Mkdir("/etc")) {
OpenPOWER on IntegriCloud