MFC: Catch 3.2-stable sysinstall up to 4.0-current level functionality,

bringing in DHCP support.  The only thing I left out were Poul-Henning's
newfs changes since I'm not sure if he's brought the rest of that support
into -stable yet.  If it turns out that this is the case, I'll MFC those
changes too.

1 files changed, 4 insertions, 10 deletions

diff --git a/usr.sbin/sysinstall/options.c b/usr.sbin/sysinstall/options.c
index 469841d..df20988 100644
--- a/usr.sbin/sysinstall/options.c
+++ b/usr.sbin/sysinstall/options.c
@@ -114,8 +114,6 @@ 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",
@@ -192,17 +190,13 @@ 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)) {
-	    if (!variable_cmp(opt.aux, "YES"))
-		variable_set2(opt.aux, "NO", -1);
-	    else
-		variable_set2(opt.aux, "YES", -1);
-	}
+	else if (variable_get(opt.aux))
+	    variable_unset(opt.aux);
 	else
-	    variable_set2(opt.aux, "YES", 0);
+	    variable_set2(opt.aux, "YES", 1);
     }
     if (opt.check)
 	opt.check(opt);