diff options
author | jkh <jkh@FreeBSD.org> | 2000-03-10 20:34:22 +0000 |
---|---|---|
committer | jkh <jkh@FreeBSD.org> | 2000-03-10 20:34:22 +0000 |
commit | 3de1574e2117cceca34670f00edf8e0535865058 (patch) | |
tree | def7dc0c2f100b4824c8d487efc7a39a90b5c441 | |
parent | a001dc9f6e4119027dd7f69e9fed68ec889583bd (diff) | |
download | FreeBSD-src-3de1574e2117cceca34670f00edf8e0535865058.zip FreeBSD-src-3de1574e2117cceca34670f00edf8e0535865058.tar.gz |
Do the right thing with USA_RESIDENT
-rw-r--r-- | release/sysinstall/dist.c | 8 | ||||
-rw-r--r-- | release/sysinstall/globals.c | 2 | ||||
-rw-r--r-- | usr.sbin/sade/globals.c | 2 | ||||
-rw-r--r-- | usr.sbin/sysinstall/dist.c | 8 | ||||
-rw-r--r-- | usr.sbin/sysinstall/globals.c | 2 |
5 files changed, 11 insertions, 11 deletions
diff --git a/release/sysinstall/dist.c b/release/sysinstall/dist.c index 040cc89..3c2ae94 100644 --- a/release/sysinstall/dist.c +++ b/release/sysinstall/dist.c @@ -399,11 +399,11 @@ distMaybeSetCRYPTO(dialogMenuItem *self) "a second pass with the Custom Installation option.")) { if (!dmenuOpenSimple(&MenuCRYPTODistributions, FALSE)) i = DITEM_FAILURE; - else - USAResident = TRUE; } - else - USAResident = FALSE; + + dialog_clear_norefresh(); + USAResident = !msgYesNo("Are you actually resident in the United States?"); + distVerifyFlags(); return i | DITEM_REDRAW | DITEM_RESTORE; } diff --git a/release/sysinstall/globals.c b/release/sysinstall/globals.c index 9b66fab..31eb3a7 100644 --- a/release/sysinstall/globals.c +++ b/release/sysinstall/globals.c @@ -71,5 +71,5 @@ globalsInit(void) VarHead = NULL; mediaDevice = NULL; RunningAsInit = FALSE; - USAResident = TRUE; + USAResident = FALSE; } diff --git a/usr.sbin/sade/globals.c b/usr.sbin/sade/globals.c index 9b66fab..31eb3a7 100644 --- a/usr.sbin/sade/globals.c +++ b/usr.sbin/sade/globals.c @@ -71,5 +71,5 @@ globalsInit(void) VarHead = NULL; mediaDevice = NULL; RunningAsInit = FALSE; - USAResident = TRUE; + USAResident = FALSE; } diff --git a/usr.sbin/sysinstall/dist.c b/usr.sbin/sysinstall/dist.c index 040cc89..3c2ae94 100644 --- a/usr.sbin/sysinstall/dist.c +++ b/usr.sbin/sysinstall/dist.c @@ -399,11 +399,11 @@ distMaybeSetCRYPTO(dialogMenuItem *self) "a second pass with the Custom Installation option.")) { if (!dmenuOpenSimple(&MenuCRYPTODistributions, FALSE)) i = DITEM_FAILURE; - else - USAResident = TRUE; } - else - USAResident = FALSE; + + dialog_clear_norefresh(); + USAResident = !msgYesNo("Are you actually resident in the United States?"); + distVerifyFlags(); return i | DITEM_REDRAW | DITEM_RESTORE; } diff --git a/usr.sbin/sysinstall/globals.c b/usr.sbin/sysinstall/globals.c index 9b66fab..31eb3a7 100644 --- a/usr.sbin/sysinstall/globals.c +++ b/usr.sbin/sysinstall/globals.c @@ -71,5 +71,5 @@ globalsInit(void) VarHead = NULL; mediaDevice = NULL; RunningAsInit = FALSE; - USAResident = TRUE; + USAResident = FALSE; } |