d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Do better things with router configuration (use proper display variable,

Browse Source 
for one thing - it's router_enable to check, not router).
This commit is contained in:
Jordan K. Hubbard 1999-12-19 22:38:59 +00:00
parent 529863cb71
commit 74ffe8004b
6 changed files with 21 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
release/sysinstall/config.c
View File

@ -730,6 +730,11 @@ configRouter(dialogMenuItem *self)
variable_unset(VAR_ROUTER);
}
}
else {
variable_set2(VAR_ROUTER_ENABLE, "NO", 1);
variable_unset(VAR_ROUTERFLAGS);
variable_unset(VAR_ROUTER);
}
return ret;
}

4
release/sysinstall/menus.c
View File

@ -300,7 +300,7 @@ DMenu MenuIndex = {
{ " Partition", "The disk Slice (PC-style partition) Editor", NULL, diskPartitionEditor },
{ " PCNFSD", "Run authentication server for PC-NFS.", dmenuVarCheck, configPCNFSD, NULL, "pcnfsd" },
{ " Root Password", "Set the system manager's password.", NULL, dmenuSystemCommand, NULL, "passwd root" },
{ " Router", "Select routing daemon (default: routed)", NULL, configRouter, NULL, "router" },
{ " Router", "Select routing daemon (default: routed)", NULL, configRouter, NULL, "router_enable" },
{ " Syscons", "The system console configuration menu.", NULL, dmenuSubmenu, NULL, &MenuSyscons },
{ " Syscons, Font", "The console screen font.", NULL, dmenuSubmenu, NULL, &MenuSysconsFont },
{ " Syscons, Keymap", "The console keymap configuration menu.", NULL, dmenuSubmenu, NULL, &MenuSysconsKeymap },
@ -1342,7 +1342,7 @@ DMenu MenuNetworking = {
{ " Ntpdate", "Select a clock-synchronization server",
dmenuVarCheck, dmenuSubmenu, NULL, &MenuNTP, '[', 'X', ']', "ntpdate_enable=YES" },
{ " router", "Select routing daemon (default: routed)",
dmenuVarCheck, configRouter, NULL, "router" },
dmenuVarCheck, configRouter, NULL, "router_enable" },
{ " Rwhod", "This machine wants to run the rwho daemon",
dmenuVarCheck, dmenuToggleVariable, NULL, "rwhod_enable=YES" },
{ " Anon FTP", "This machine wishes to allow anonymous FTP.",

5
usr.sbin/sade/config.c
View File

@ -730,6 +730,11 @@ configRouter(dialogMenuItem *self)
variable_unset(VAR_ROUTER);
}
}
else {
variable_set2(VAR_ROUTER_ENABLE, "NO", 1);
variable_unset(VAR_ROUTERFLAGS);
variable_unset(VAR_ROUTER);
}
return ret;
}

4
usr.sbin/sade/menus.c
View File

@ -300,7 +300,7 @@ DMenu MenuIndex = {
{ " Partition", "The disk Slice (PC-style partition) Editor", NULL, diskPartitionEditor },
{ " PCNFSD", "Run authentication server for PC-NFS.", dmenuVarCheck, configPCNFSD, NULL, "pcnfsd" },
{ " Root Password", "Set the system manager's password.", NULL, dmenuSystemCommand, NULL, "passwd root" },
{ " Router", "Select routing daemon (default: routed)", NULL, configRouter, NULL, "router" },
{ " Router", "Select routing daemon (default: routed)", NULL, configRouter, NULL, "router_enable" },
{ " Syscons", "The system console configuration menu.", NULL, dmenuSubmenu, NULL, &MenuSyscons },
{ " Syscons, Font", "The console screen font.", NULL, dmenuSubmenu, NULL, &MenuSysconsFont },
{ " Syscons, Keymap", "The console keymap configuration menu.", NULL, dmenuSubmenu, NULL, &MenuSysconsKeymap },
@ -1342,7 +1342,7 @@ DMenu MenuNetworking = {
{ " Ntpdate", "Select a clock-synchronization server",
dmenuVarCheck, dmenuSubmenu, NULL, &MenuNTP, '[', 'X', ']', "ntpdate_enable=YES" },
{ " router", "Select routing daemon (default: routed)",
dmenuVarCheck, configRouter, NULL, "router" },
dmenuVarCheck, configRouter, NULL, "router_enable" },
{ " Rwhod", "This machine wants to run the rwho daemon",
dmenuVarCheck, dmenuToggleVariable, NULL, "rwhod_enable=YES" },
{ " Anon FTP", "This machine wishes to allow anonymous FTP.",

5
usr.sbin/sysinstall/config.c
View File

@ -730,6 +730,11 @@ configRouter(dialogMenuItem *self)
variable_unset(VAR_ROUTER);
}
}
else {
variable_set2(VAR_ROUTER_ENABLE, "NO", 1);
variable_unset(VAR_ROUTERFLAGS);
variable_unset(VAR_ROUTER);
}
return ret;
}

4
usr.sbin/sysinstall/menus.c
View File

@ -300,7 +300,7 @@ DMenu MenuIndex = {
{ " Partition", "The disk Slice (PC-style partition) Editor", NULL, diskPartitionEditor },
{ " PCNFSD", "Run authentication server for PC-NFS.", dmenuVarCheck, configPCNFSD, NULL, "pcnfsd" },
{ " Root Password", "Set the system manager's password.", NULL, dmenuSystemCommand, NULL, "passwd root" },
{ " Router", "Select routing daemon (default: routed)", NULL, configRouter, NULL, "router" },
{ " Router", "Select routing daemon (default: routed)", NULL, configRouter, NULL, "router_enable" },
{ " Syscons", "The system console configuration menu.", NULL, dmenuSubmenu, NULL, &MenuSyscons },
{ " Syscons, Font", "The console screen font.", NULL, dmenuSubmenu, NULL, &MenuSysconsFont },
{ " Syscons, Keymap", "The console keymap configuration menu.", NULL, dmenuSubmenu, NULL, &MenuSysconsKeymap },
@ -1342,7 +1342,7 @@ DMenu MenuNetworking = {
{ " Ntpdate", "Select a clock-synchronization server",
dmenuVarCheck, dmenuSubmenu, NULL, &MenuNTP, '[', 'X', ']', "ntpdate_enable=YES" },
{ " router", "Select routing daemon (default: routed)",
dmenuVarCheck, configRouter, NULL, "router" },
dmenuVarCheck, configRouter, NULL, "router_enable" },
{ " Rwhod", "This machine wants to run the rwho daemon",
dmenuVarCheck, dmenuToggleVariable, NULL, "rwhod_enable=YES" },
{ " Anon FTP", "This machine wishes to allow anonymous FTP.",