mirror of
https://git.FreeBSD.org/src.git
synced 2025-01-05 12:56:08 +00:00
Don't run routed by default.
Virtually-Demanded-At-Gunpoint-By: joerg
This commit is contained in:
parent
6b95a3424e
commit
b4a24ca1f0
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=20077
@ -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 */
|
||||
|
@ -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);
|
||||
|
@ -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 */
|
||||
|
@ -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);
|
||||
|
@ -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 */
|
||||
|
@ -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);
|
||||
|
Loading…
Reference in New Issue
Block a user