diff options
Diffstat (limited to 'usr.sbin')
| -rw-r--r-- | usr.sbin/sade/config.c | 8 | ||||
| -rw-r--r-- | usr.sbin/sade/install.c | 4 | ||||
| -rw-r--r-- | usr.sbin/sysinstall/config.c | 8 | ||||
| -rw-r--r-- | usr.sbin/sysinstall/install.c | 4 |
4 files changed, 12 insertions, 12 deletions
diff --git a/usr.sbin/sade/config.c b/usr.sbin/sade/config.c index 76316a6..7bdc5b9 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.59 1996/11/09 19:25:59 jkh Exp $ + * $Id: config.c,v 1.60 1996/11/27 22:52:31 phk Exp $ * * Copyright (c) 1995 * Jordan Hubbard. All rights reserved. @@ -434,7 +434,7 @@ configRouter(dialogMenuItem *self) "will attempt to load if you select gated. Any other\n" "choice of routing daemon will be assumed to be something\n" "the user intends to install themselves before rebooting\n" - "the system. If you don't want any routing daemon, say NO") ? + "the system. If you don't want any routing daemon, choose NO") ? DITEM_SUCCESS : DITEM_FAILURE; if (ret == DITEM_SUCCESS) { @@ -444,8 +444,8 @@ configRouter(dialogMenuItem *self) if (strcmp(cp, "NO")) { if (!strcmp(cp, "gated")) { if (package_add(PACKAGE_GATED) != DITEM_SUCCESS) { - msgConfirm("Unable to load gated package. Falling back to routed."); - variable_set2(VAR_ROUTER, "routed"); + msgConfirm("Unable to load gated package. Falling back to no router."); + variable_set2(VAR_ROUTER, "NO"); } } /* Now get the flags, if they chose a router */ diff --git a/usr.sbin/sade/install.c b/usr.sbin/sade/install.c index 4734d77..1f1499b 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.142 1996/11/16 22:42:13 joerg Exp $ + * $Id: install.c,v 1.143 1996/12/01 12:27:36 jkh Exp $ * * Copyright (c) 1995 * Jordan Hubbard. All rights reserved. @@ -834,7 +834,7 @@ installVarDefaults(dialogMenuItem *self) char *cp; /* Set default startup options */ - variable_set2(VAR_ROUTER, "routed"); + variable_set2(VAR_ROUTER, "NO"); variable_set2(VAR_RELNAME, RELEASE_NAME); variable_set2(VAR_CPIO_VERBOSITY, "high"); variable_set2(VAR_TAPE_BLOCKSIZE, DEFAULT_TAPE_BLOCKSIZE); diff --git a/usr.sbin/sysinstall/config.c b/usr.sbin/sysinstall/config.c index 76316a6..7bdc5b9 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.59 1996/11/09 19:25:59 jkh Exp $ + * $Id: config.c,v 1.60 1996/11/27 22:52:31 phk Exp $ * * Copyright (c) 1995 * Jordan Hubbard. All rights reserved. @@ -434,7 +434,7 @@ configRouter(dialogMenuItem *self) "will attempt to load if you select gated. Any other\n" "choice of routing daemon will be assumed to be something\n" "the user intends to install themselves before rebooting\n" - "the system. If you don't want any routing daemon, say NO") ? + "the system. If you don't want any routing daemon, choose NO") ? DITEM_SUCCESS : DITEM_FAILURE; if (ret == DITEM_SUCCESS) { @@ -444,8 +444,8 @@ configRouter(dialogMenuItem *self) if (strcmp(cp, "NO")) { if (!strcmp(cp, "gated")) { if (package_add(PACKAGE_GATED) != DITEM_SUCCESS) { - msgConfirm("Unable to load gated package. Falling back to routed."); - variable_set2(VAR_ROUTER, "routed"); + msgConfirm("Unable to load gated package. Falling back to no router."); + variable_set2(VAR_ROUTER, "NO"); } } /* Now get the flags, if they chose a router */ diff --git a/usr.sbin/sysinstall/install.c b/usr.sbin/sysinstall/install.c index 4734d77..1f1499b 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.142 1996/11/16 22:42:13 joerg Exp $ + * $Id: install.c,v 1.143 1996/12/01 12:27:36 jkh Exp $ * * Copyright (c) 1995 * Jordan Hubbard. All rights reserved. @@ -834,7 +834,7 @@ installVarDefaults(dialogMenuItem *self) char *cp; /* Set default startup options */ - variable_set2(VAR_ROUTER, "routed"); + variable_set2(VAR_ROUTER, "NO"); variable_set2(VAR_RELNAME, RELEASE_NAME); variable_set2(VAR_CPIO_VERBOSITY, "high"); variable_set2(VAR_TAPE_BLOCKSIZE, DEFAULT_TAPE_BLOCKSIZE); |
