diff options
| author | jkh <jkh@FreeBSD.org> | 1999-12-19 22:38:59 +0000 |
|---|---|---|
| committer | jkh <jkh@FreeBSD.org> | 1999-12-19 22:38:59 +0000 |
| commit | 81c7927f9404b748ed5c0034cfdafa345fae35cc (patch) | |
| tree | b1f3a035ea31228c9f1f06890282cbab9b4efcf7 /usr.sbin/sysinstall | |
| parent | 85110b43444726c9fddea55ac167c00f52b2e734 (diff) | |
| download | FreeBSD-src-81c7927f9404b748ed5c0034cfdafa345fae35cc.zip FreeBSD-src-81c7927f9404b748ed5c0034cfdafa345fae35cc.tar.gz | |
Do better things with router configuration (use proper display variable,
for one thing - it's router_enable to check, not router).
Diffstat (limited to 'usr.sbin/sysinstall')
| -rw-r--r-- | usr.sbin/sysinstall/config.c | 5 | ||||
| -rw-r--r-- | usr.sbin/sysinstall/menus.c | 4 |
2 files changed, 7 insertions, 2 deletions
diff --git a/usr.sbin/sysinstall/config.c b/usr.sbin/sysinstall/config.c index 4dda1ac..2d4028c 100644 --- a/usr.sbin/sysinstall/config.c +++ b/usr.sbin/sysinstall/config.c @@ -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; } diff --git a/usr.sbin/sysinstall/menus.c b/usr.sbin/sysinstall/menus.c index ad944fa..94a33fa 100644 --- a/usr.sbin/sysinstall/menus.c +++ b/usr.sbin/sysinstall/menus.c @@ -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.", |
