diff options
author | jkh <jkh@FreeBSD.org> | 1999-09-02 00:51:16 +0000 |
---|---|---|
committer | jkh <jkh@FreeBSD.org> | 1999-09-02 00:51:16 +0000 |
commit | 2b983202e6de74a0ad0fc2765f080543e3895b9f (patch) | |
tree | 056879bb90e16442c3b7d9bc3de1330e328d93b9 /usr.sbin/sysinstall/options.c | |
parent | 3e73f6e0b13a943ed99fc8f5f463a7a251c2e797 (diff) | |
download | FreeBSD-src-2b983202e6de74a0ad0fc2765f080543e3895b9f.zip FreeBSD-src-2b983202e6de74a0ad0fc2765f080543e3895b9f.tar.gz |
Oh crud, did I ever screw the pooch! Rather than sync this with -stable,
I backed-out the changes in -current and didn't touch stable at all (I
thought I had my patch order reversed, not what actually happened).
AIEEE! I can't even blame the crack for this one since I broke my
crack pipe a few weeks ago. I think sleep deprivation gets the blame
for this one.
Medal for noticing this one goes to: Jim Bloom <bloom@acm.org>
Diffstat (limited to 'usr.sbin/sysinstall/options.c')
-rw-r--r-- | usr.sbin/sysinstall/options.c | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/usr.sbin/sysinstall/options.c b/usr.sbin/sysinstall/options.c index df20988..469841d 100644 --- a/usr.sbin/sysinstall/options.c +++ b/usr.sbin/sysinstall/options.c @@ -114,6 +114,8 @@ static Option Options[] = { OPT_IS_VAR, NULL, VAR_NO_WARN, varCheck }, { "Yes to All", "Assume \"Yes\" answers to all non-critical dialogs", OPT_IS_VAR, NULL, VAR_NO_CONFIRM, varCheck }, +{ "DHCP", "Attempt automatic DHCP configuration of interfaces", + OPT_IS_VAR, NULL, VAR_TRY_DHCP, varCheck }, { "FTP username", "Username and password to use instead of anonymous", OPT_IS_FUNC, mediaSetFTPUserPass, VAR_FTP_USER, varCheck }, { "Editor", "Which text editor to use during installation", @@ -190,13 +192,17 @@ fire(Option opt) } else if (opt.type == OPT_IS_VAR) { if (opt.data) { - (void)variable_get_value(opt.aux, opt.data, 1); + (void)variable_get_value(opt.aux, opt.data, -1); status = 1; } - else if (variable_get(opt.aux)) - variable_unset(opt.aux); + else if (variable_get(opt.aux)) { + if (!variable_cmp(opt.aux, "YES")) + variable_set2(opt.aux, "NO", -1); + else + variable_set2(opt.aux, "YES", -1); + } else - variable_set2(opt.aux, "YES", 1); + variable_set2(opt.aux, "YES", 0); } if (opt.check) opt.check(opt); |