summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--release/sysinstall/config.c13
-rw-r--r--release/sysinstall/install.c4
-rw-r--r--usr.sbin/sade/config.c13
-rw-r--r--usr.sbin/sade/install.c4
-rw-r--r--usr.sbin/sysinstall/config.c13
-rw-r--r--usr.sbin/sysinstall/install.c4
6 files changed, 18 insertions, 33 deletions
diff --git a/release/sysinstall/config.c b/release/sysinstall/config.c
index 5de067c..df82a66 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.34 1996/06/08 07:02:18 jkh Exp $
+ * $Id: config.c,v 1.35 1996/06/12 14:20:16 jkh Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
@@ -420,14 +420,9 @@ skip:
int
configRoutedFlags(dialogMenuItem *self)
{
- if (variable_get(VAR_ROUTEDFLAGS)) {
- variable_unset(VAR_ROUTEDFLAGS);
- return DITEM_SUCCESS | DITEM_REDRAW;
- }
- else
- return variable_get_value(VAR_ROUTEDFLAGS,
- "Specify the flags for routed; -q is the default, -s is\n"
- "a good choice for gateway machines.") ? DITEM_SUCCESS : DITEM_FAILURE;
+ return variable_get_value(VAR_ROUTEDFLAGS,
+ "Specify the flags for routed; -q is the default, -s is\n"
+ "a good choice for gateway machines.") ? DITEM_SUCCESS : DITEM_FAILURE;
}
int
diff --git a/release/sysinstall/install.c b/release/sysinstall/install.c
index f973bc3..a55fe6a 100644
--- a/release/sysinstall/install.c
+++ b/release/sysinstall/install.c
@@ -4,7 +4,7 @@
* This is probably the last program in the `sysinstall' line - the next
* generation being essentially a complete rewrite.
*
- * $Id: install.c,v 1.99 1996/06/11 10:16:53 jkh Exp $
+ * $Id: install.c,v 1.100 1996/06/12 14:02:09 jkh Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
@@ -788,7 +788,7 @@ installVarDefaults(dialogMenuItem *self)
variable_set2(VAR_CPIO_VERBOSITY, "high");
variable_set2(VAR_TAPE_BLOCKSIZE, DEFAULT_TAPE_BLOCKSIZE);
if (RunningAsInit)
- variable_set2(VAR_EDITOR, "/stand/ee");
+ variable_set2(VAR_EDITOR, "/usr/bin/ee");
else {
char *cp = getenv("EDITOR");
diff --git a/usr.sbin/sade/config.c b/usr.sbin/sade/config.c
index 5de067c..df82a66 100644
--- a/usr.sbin/sade/config.c
+++ b/usr.sbin/sade/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.34 1996/06/08 07:02:18 jkh Exp $
+ * $Id: config.c,v 1.35 1996/06/12 14:20:16 jkh Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
@@ -420,14 +420,9 @@ skip:
int
configRoutedFlags(dialogMenuItem *self)
{
- if (variable_get(VAR_ROUTEDFLAGS)) {
- variable_unset(VAR_ROUTEDFLAGS);
- return DITEM_SUCCESS | DITEM_REDRAW;
- }
- else
- return variable_get_value(VAR_ROUTEDFLAGS,
- "Specify the flags for routed; -q is the default, -s is\n"
- "a good choice for gateway machines.") ? DITEM_SUCCESS : DITEM_FAILURE;
+ return variable_get_value(VAR_ROUTEDFLAGS,
+ "Specify the flags for routed; -q is the default, -s is\n"
+ "a good choice for gateway machines.") ? DITEM_SUCCESS : DITEM_FAILURE;
}
int
diff --git a/usr.sbin/sade/install.c b/usr.sbin/sade/install.c
index f973bc3..a55fe6a 100644
--- a/usr.sbin/sade/install.c
+++ b/usr.sbin/sade/install.c
@@ -4,7 +4,7 @@
* This is probably the last program in the `sysinstall' line - the next
* generation being essentially a complete rewrite.
*
- * $Id: install.c,v 1.99 1996/06/11 10:16:53 jkh Exp $
+ * $Id: install.c,v 1.100 1996/06/12 14:02:09 jkh Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
@@ -788,7 +788,7 @@ installVarDefaults(dialogMenuItem *self)
variable_set2(VAR_CPIO_VERBOSITY, "high");
variable_set2(VAR_TAPE_BLOCKSIZE, DEFAULT_TAPE_BLOCKSIZE);
if (RunningAsInit)
- variable_set2(VAR_EDITOR, "/stand/ee");
+ variable_set2(VAR_EDITOR, "/usr/bin/ee");
else {
char *cp = getenv("EDITOR");
diff --git a/usr.sbin/sysinstall/config.c b/usr.sbin/sysinstall/config.c
index 5de067c..df82a66 100644
--- a/usr.sbin/sysinstall/config.c
+++ b/usr.sbin/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.34 1996/06/08 07:02:18 jkh Exp $
+ * $Id: config.c,v 1.35 1996/06/12 14:20:16 jkh Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
@@ -420,14 +420,9 @@ skip:
int
configRoutedFlags(dialogMenuItem *self)
{
- if (variable_get(VAR_ROUTEDFLAGS)) {
- variable_unset(VAR_ROUTEDFLAGS);
- return DITEM_SUCCESS | DITEM_REDRAW;
- }
- else
- return variable_get_value(VAR_ROUTEDFLAGS,
- "Specify the flags for routed; -q is the default, -s is\n"
- "a good choice for gateway machines.") ? DITEM_SUCCESS : DITEM_FAILURE;
+ return variable_get_value(VAR_ROUTEDFLAGS,
+ "Specify the flags for routed; -q is the default, -s is\n"
+ "a good choice for gateway machines.") ? DITEM_SUCCESS : DITEM_FAILURE;
}
int
diff --git a/usr.sbin/sysinstall/install.c b/usr.sbin/sysinstall/install.c
index f973bc3..a55fe6a 100644
--- a/usr.sbin/sysinstall/install.c
+++ b/usr.sbin/sysinstall/install.c
@@ -4,7 +4,7 @@
* This is probably the last program in the `sysinstall' line - the next
* generation being essentially a complete rewrite.
*
- * $Id: install.c,v 1.99 1996/06/11 10:16:53 jkh Exp $
+ * $Id: install.c,v 1.100 1996/06/12 14:02:09 jkh Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
@@ -788,7 +788,7 @@ installVarDefaults(dialogMenuItem *self)
variable_set2(VAR_CPIO_VERBOSITY, "high");
variable_set2(VAR_TAPE_BLOCKSIZE, DEFAULT_TAPE_BLOCKSIZE);
if (RunningAsInit)
- variable_set2(VAR_EDITOR, "/stand/ee");
+ variable_set2(VAR_EDITOR, "/usr/bin/ee");
else {
char *cp = getenv("EDITOR");
OpenPOWER on IntegriCloud