summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJordan K. Hubbard <jkh@FreeBSD.org>2000-03-10 20:34:22 +0000
committerJordan K. Hubbard <jkh@FreeBSD.org>2000-03-10 20:34:22 +0000
commite03f42bcc68c298f277afec0eabcb13ad9290a6d (patch)
treeebfe05f1a67a21f491321c3c1fe32c2669809443
parentdad50e2ed3e91e9bc48b6a535c112734833d9e7b (diff)
Notes
-rw-r--r--release/sysinstall/dist.c8
-rw-r--r--release/sysinstall/globals.c2
-rw-r--r--usr.sbin/sade/globals.c2
-rw-r--r--usr.sbin/sysinstall/dist.c8
-rw-r--r--usr.sbin/sysinstall/globals.c2
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;
}