From 5eefe53afae7712d1791242515af42da4bb22f3d Mon Sep 17 00:00:00 2001 From: jkh Date: Fri, 10 Mar 2000 20:34:22 +0000 Subject: [PATCH] Do the right thing with USA_RESIDENT --- release/sysinstall/dist.c | 8 ++++---- release/sysinstall/globals.c | 2 +- usr.sbin/sade/globals.c | 2 +- usr.sbin/sysinstall/dist.c | 8 ++++---- 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 040cc89e1dc1..3c2ae940714e 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 9b66fab2180f..31eb3a749c5b 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 9b66fab2180f..31eb3a749c5b 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 040cc89e1dc1..3c2ae940714e 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 9b66fab2180f..31eb3a749c5b 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; }