Put up some more helpful dialog boxes.

Adjust some text to make more sense.

5 files changed, 10 insertions, 8 deletions

diff --git a/release/sysinstall/dist.c b/release/sysinstall/dist.c
index 8bcf5ac..b72b2cd 100644
--- a/release/sysinstall/dist.c
+++ b/release/sysinstall/dist.c
@@ -583,7 +583,6 @@ distExtract(char *parent, Distribution *me)
     struct sigaction old, new;
 
     status = TRUE;
-    dialog_clear_norefresh();
     if (isDebug())
 	msgDebug("distExtract: parent: %s, me: %s\n", parent ? parent : "(none)", me->my_name);
 
@@ -591,6 +590,8 @@ distExtract(char *parent, Distribution *me)
     new.sa_handler = handle_intr;
     new.sa_flags = 0;
     (void)sigemptyset(&new.sa_mask);
+    dialog_clear_norefresh();
+    dialog_msgbox("Please Wait", "Extracting all requested distributions...", -1, -1, 0);
     sigaction(SIGINT, &new, &old);
 
     /* Loop through to see if we're in our parent's plans */
diff --git a/release/sysinstall/install.c b/release/sysinstall/install.c
index 9271b8b..8d9da81 100644
--- a/release/sysinstall/install.c
+++ b/release/sysinstall/install.c
@@ -488,14 +488,14 @@ nodisks:
 #endif
 
 #ifdef __alpha__
-    msgConfirm("First, you need to create BSD partitions on the disk which you are\n"
+    msgConfirm("Now you need to create BSD partitions on the disk which you are\n"
 	       "installing to.  If you have a reasonable amount of disk space (200MB or more)\n"
 	       "and don't have any special requirements, simply use the (A)uto command to\n"
 	       "allocate space automatically.  If you have more specific needs or just don't\n"
 	       "care for the layout chosen by (A)uto, press F1 for more information on\n"
 	       "manual layout.");
 #else
-    msgConfirm("First, you need to create BSD partitions inside of the fdisk partition(s)\n"
+    msgConfirm("Now you need to create BSD partitions inside of the fdisk partition(s)\n"
 	       "just created.  If you have a reasonable amount of disk space (200MB or more)\n"
 	       "and don't have any special requirements, simply use the (A)uto command to\n"
 	       "allocate space automatically.  If you have more specific needs or just don't\n"
diff --git a/usr.sbin/sade/install.c b/usr.sbin/sade/install.c
index 9271b8b..8d9da81 100644
--- a/usr.sbin/sade/install.c
+++ b/usr.sbin/sade/install.c
@@ -488,14 +488,14 @@ nodisks:
 #endif
 
 #ifdef __alpha__
-    msgConfirm("First, you need to create BSD partitions on the disk which you are\n"
+    msgConfirm("Now you need to create BSD partitions on the disk which you are\n"
 	       "installing to.  If you have a reasonable amount of disk space (200MB or more)\n"
 	       "and don't have any special requirements, simply use the (A)uto command to\n"
 	       "allocate space automatically.  If you have more specific needs or just don't\n"
 	       "care for the layout chosen by (A)uto, press F1 for more information on\n"
 	       "manual layout.");
 #else
-    msgConfirm("First, you need to create BSD partitions inside of the fdisk partition(s)\n"
+    msgConfirm("Now you need to create BSD partitions inside of the fdisk partition(s)\n"
 	       "just created.  If you have a reasonable amount of disk space (200MB or more)\n"
 	       "and don't have any special requirements, simply use the (A)uto command to\n"
 	       "allocate space automatically.  If you have more specific needs or just don't\n"
diff --git a/usr.sbin/sysinstall/dist.c b/usr.sbin/sysinstall/dist.c
index 8bcf5ac..b72b2cd 100644
--- a/usr.sbin/sysinstall/dist.c
+++ b/usr.sbin/sysinstall/dist.c
@@ -583,7 +583,6 @@ distExtract(char *parent, Distribution *me)
     struct sigaction old, new;
 
     status = TRUE;
-    dialog_clear_norefresh();
     if (isDebug())
 	msgDebug("distExtract: parent: %s, me: %s\n", parent ? parent : "(none)", me->my_name);
 
@@ -591,6 +590,8 @@ distExtract(char *parent, Distribution *me)
     new.sa_handler = handle_intr;
     new.sa_flags = 0;
     (void)sigemptyset(&new.sa_mask);
+    dialog_clear_norefresh();
+    dialog_msgbox("Please Wait", "Extracting all requested distributions...", -1, -1, 0);
     sigaction(SIGINT, &new, &old);
 
     /* Loop through to see if we're in our parent's plans */
diff --git a/usr.sbin/sysinstall/install.c b/usr.sbin/sysinstall/install.c
index 9271b8b..8d9da81 100644
--- a/usr.sbin/sysinstall/install.c
+++ b/usr.sbin/sysinstall/install.c
@@ -488,14 +488,14 @@ nodisks:
 #endif
 
 #ifdef __alpha__
-    msgConfirm("First, you need to create BSD partitions on the disk which you are\n"
+    msgConfirm("Now you need to create BSD partitions on the disk which you are\n"
 	       "installing to.  If you have a reasonable amount of disk space (200MB or more)\n"
 	       "and don't have any special requirements, simply use the (A)uto command to\n"
 	       "allocate space automatically.  If you have more specific needs or just don't\n"
 	       "care for the layout chosen by (A)uto, press F1 for more information on\n"
 	       "manual layout.");
 #else
-    msgConfirm("First, you need to create BSD partitions inside of the fdisk partition(s)\n"
+    msgConfirm("Now you need to create BSD partitions inside of the fdisk partition(s)\n"
 	       "just created.  If you have a reasonable amount of disk space (200MB or more)\n"
 	       "and don't have any special requirements, simply use the (A)uto command to\n"
 	       "allocate space automatically.  If you have more specific needs or just don't\n"