summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--release/sysinstall/dist.c9
-rw-r--r--release/sysinstall/install.c26
-rw-r--r--release/sysinstall/system.c6
-rw-r--r--usr.sbin/sade/install.c26
-rw-r--r--usr.sbin/sade/system.c6
-rw-r--r--usr.sbin/sysinstall/dist.c9
-rw-r--r--usr.sbin/sysinstall/install.c26
-rw-r--r--usr.sbin/sysinstall/system.c6
8 files changed, 82 insertions, 32 deletions
diff --git a/release/sysinstall/dist.c b/release/sysinstall/dist.c
index 237986a..02b7eb6 100644
--- a/release/sysinstall/dist.c
+++ b/release/sysinstall/dist.c
@@ -4,7 +4,7 @@
* This is probably the last program in the `sysinstall' line - the next
* generation being essentially a complete rewrite.
*
- * $Id: dist.c,v 1.46 1996/04/29 17:59:07 jkh Exp $
+ * $Id: dist.c,v 1.47 1996/04/29 21:07:44 jkh Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
@@ -492,9 +492,10 @@ distExtractAll(dialogMenuItem *self)
if (Dists) {
printSelected(buf, Dists, DistTable);
- msgConfirm("Couldn't extract all of the distributions. This may\n"
- "be because the following distributions are not available on the\n"
- "installation media you've chosen:\n\n\t%s", buf);
+ dialog_clear();
+ msgConfirm("Couldn't extract the following distributions. This may\n"
+ "be because they were not available on the installation\n"
+ "media you've chosen:\n\n\t%s", buf);
}
return DITEM_SUCCESS;
}
diff --git a/release/sysinstall/install.c b/release/sysinstall/install.c
index 26b26f4..3317346 100644
--- a/release/sysinstall/install.c
+++ b/release/sysinstall/install.c
@@ -4,7 +4,7 @@
* This is probably the last program in the `sysinstall' line - the next
* generation being essentially a complete rewrite.
*
- * $Id: install.c,v 1.91 1996/04/29 06:47:09 jkh Exp $
+ * $Id: install.c,v 1.92 1996/04/29 19:34:25 jkh Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
@@ -297,11 +297,13 @@ installExpress(dialogMenuItem *self)
return i;
if (!Dists) {
+ dialog_clear();
if (!dmenuOpenSimple(&MenuDistributions) && !Dists)
return DITEM_FAILURE | DITEM_RESTORE | DITEM_RECREATE;
}
if (!mediaDevice) {
+ dialog_clear();
if (!dmenuOpenSimple(&MenuMedia) || !mediaDevice)
return DITEM_FAILURE | DITEM_RESTORE | DITEM_RECREATE;
}
@@ -357,8 +359,8 @@ installNovice(dialogMenuItem *self)
break;
}
- dialog_clear();
if (!mediaDevice) {
+ dialog_clear();
msgConfirm("Finally, you must specify an installation medium.");
if (!dmenuOpenSimple(&MenuMedia) || !mediaDevice)
return DITEM_FAILURE | DITEM_RESTORE | DITEM_RECREATE;
@@ -374,7 +376,7 @@ installNovice(dialogMenuItem *self)
}
else
- msgConfirm("Congradulations! You now have FreeBSD installed on your system.\n"
+ msgConfirm("Congradulations! You now have FreeBSD installed on your system.\n\n"
"We will now move on to the final configuration questions.\n"
"For any option you do not wish to configure, simply select\n"
"Cancel.\n\n"
@@ -413,8 +415,12 @@ installNovice(dialogMenuItem *self)
if (!msgYesNo("Do you want to configure this machine as a WEB server?"))
configApache(self);
- if (!msgYesNo("Would you like to customize your system console settings?"))
+ if (!msgYesNo("Would you like to customize your system console settings?")) {
+ WINDOW *w = savescr();
+
dmenuOpenSimple(&MenuSyscons);
+ restorescr(w);
+ }
if (!msgYesNo("Would you like to set this machine's time zone now?")) {
WINDOW *w = savescr();
@@ -424,8 +430,12 @@ installNovice(dialogMenuItem *self)
restorescr(w);
}
- if (!msgYesNo("Does this system have a mouse attached to it?"))
+ if (!msgYesNo("Does this system have a mouse attached to it?")) {
+ WINDOW *w = savescr();
+
dmenuOpenSimple(&MenuMouse);
+ restorescr(w);
+ }
if (directory_exists("/usr/X11R6")) {
if (!msgYesNo("Would you like to configure your X server at this time?"))
@@ -513,8 +523,12 @@ installConfigure(void)
{
/* Final menu of last resort */
if (!msgYesNo("Visit the general configuration menu for a chance to set\n"
- "any last options?"))
+ "any last options?")) {
+ WINDOW *w = savescr();
+
dmenuOpenSimple(&MenuConfigure);
+ restorescr(w);
+ }
/* Write out any changes .. */
configResolv();
diff --git a/release/sysinstall/system.c b/release/sysinstall/system.c
index ff448eb..5a480d3 100644
--- a/release/sysinstall/system.c
+++ b/release/sysinstall/system.c
@@ -4,7 +4,7 @@
* This is probably the last program in the `sysinstall' line - the next
* generation being essentially a complete rewrite.
*
- * $Id: system.c,v 1.55 1996/04/28 03:27:26 jkh Exp $
+ * $Id: system.c,v 1.56 1996/04/28 20:54:09 jkh Exp $
*
* Jordan Hubbard
*
@@ -277,7 +277,9 @@ systemCreateHoloshell(void)
msgDebug("Was unable to execute sh for Holographic shell!\n");
exit(1);
}
- else
+ else {
msgNotify("Starting an emergency holographic shell on VTY4");
+ sleep(1);
+ }
}
}
diff --git a/usr.sbin/sade/install.c b/usr.sbin/sade/install.c
index 26b26f4..3317346 100644
--- a/usr.sbin/sade/install.c
+++ b/usr.sbin/sade/install.c
@@ -4,7 +4,7 @@
* This is probably the last program in the `sysinstall' line - the next
* generation being essentially a complete rewrite.
*
- * $Id: install.c,v 1.91 1996/04/29 06:47:09 jkh Exp $
+ * $Id: install.c,v 1.92 1996/04/29 19:34:25 jkh Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
@@ -297,11 +297,13 @@ installExpress(dialogMenuItem *self)
return i;
if (!Dists) {
+ dialog_clear();
if (!dmenuOpenSimple(&MenuDistributions) && !Dists)
return DITEM_FAILURE | DITEM_RESTORE | DITEM_RECREATE;
}
if (!mediaDevice) {
+ dialog_clear();
if (!dmenuOpenSimple(&MenuMedia) || !mediaDevice)
return DITEM_FAILURE | DITEM_RESTORE | DITEM_RECREATE;
}
@@ -357,8 +359,8 @@ installNovice(dialogMenuItem *self)
break;
}
- dialog_clear();
if (!mediaDevice) {
+ dialog_clear();
msgConfirm("Finally, you must specify an installation medium.");
if (!dmenuOpenSimple(&MenuMedia) || !mediaDevice)
return DITEM_FAILURE | DITEM_RESTORE | DITEM_RECREATE;
@@ -374,7 +376,7 @@ installNovice(dialogMenuItem *self)
}
else
- msgConfirm("Congradulations! You now have FreeBSD installed on your system.\n"
+ msgConfirm("Congradulations! You now have FreeBSD installed on your system.\n\n"
"We will now move on to the final configuration questions.\n"
"For any option you do not wish to configure, simply select\n"
"Cancel.\n\n"
@@ -413,8 +415,12 @@ installNovice(dialogMenuItem *self)
if (!msgYesNo("Do you want to configure this machine as a WEB server?"))
configApache(self);
- if (!msgYesNo("Would you like to customize your system console settings?"))
+ if (!msgYesNo("Would you like to customize your system console settings?")) {
+ WINDOW *w = savescr();
+
dmenuOpenSimple(&MenuSyscons);
+ restorescr(w);
+ }
if (!msgYesNo("Would you like to set this machine's time zone now?")) {
WINDOW *w = savescr();
@@ -424,8 +430,12 @@ installNovice(dialogMenuItem *self)
restorescr(w);
}
- if (!msgYesNo("Does this system have a mouse attached to it?"))
+ if (!msgYesNo("Does this system have a mouse attached to it?")) {
+ WINDOW *w = savescr();
+
dmenuOpenSimple(&MenuMouse);
+ restorescr(w);
+ }
if (directory_exists("/usr/X11R6")) {
if (!msgYesNo("Would you like to configure your X server at this time?"))
@@ -513,8 +523,12 @@ installConfigure(void)
{
/* Final menu of last resort */
if (!msgYesNo("Visit the general configuration menu for a chance to set\n"
- "any last options?"))
+ "any last options?")) {
+ WINDOW *w = savescr();
+
dmenuOpenSimple(&MenuConfigure);
+ restorescr(w);
+ }
/* Write out any changes .. */
configResolv();
diff --git a/usr.sbin/sade/system.c b/usr.sbin/sade/system.c
index ff448eb..5a480d3 100644
--- a/usr.sbin/sade/system.c
+++ b/usr.sbin/sade/system.c
@@ -4,7 +4,7 @@
* This is probably the last program in the `sysinstall' line - the next
* generation being essentially a complete rewrite.
*
- * $Id: system.c,v 1.55 1996/04/28 03:27:26 jkh Exp $
+ * $Id: system.c,v 1.56 1996/04/28 20:54:09 jkh Exp $
*
* Jordan Hubbard
*
@@ -277,7 +277,9 @@ systemCreateHoloshell(void)
msgDebug("Was unable to execute sh for Holographic shell!\n");
exit(1);
}
- else
+ else {
msgNotify("Starting an emergency holographic shell on VTY4");
+ sleep(1);
+ }
}
}
diff --git a/usr.sbin/sysinstall/dist.c b/usr.sbin/sysinstall/dist.c
index 237986a..02b7eb6 100644
--- a/usr.sbin/sysinstall/dist.c
+++ b/usr.sbin/sysinstall/dist.c
@@ -4,7 +4,7 @@
* This is probably the last program in the `sysinstall' line - the next
* generation being essentially a complete rewrite.
*
- * $Id: dist.c,v 1.46 1996/04/29 17:59:07 jkh Exp $
+ * $Id: dist.c,v 1.47 1996/04/29 21:07:44 jkh Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
@@ -492,9 +492,10 @@ distExtractAll(dialogMenuItem *self)
if (Dists) {
printSelected(buf, Dists, DistTable);
- msgConfirm("Couldn't extract all of the distributions. This may\n"
- "be because the following distributions are not available on the\n"
- "installation media you've chosen:\n\n\t%s", buf);
+ dialog_clear();
+ msgConfirm("Couldn't extract the following distributions. This may\n"
+ "be because they were not available on the installation\n"
+ "media you've chosen:\n\n\t%s", buf);
}
return DITEM_SUCCESS;
}
diff --git a/usr.sbin/sysinstall/install.c b/usr.sbin/sysinstall/install.c
index 26b26f4..3317346 100644
--- a/usr.sbin/sysinstall/install.c
+++ b/usr.sbin/sysinstall/install.c
@@ -4,7 +4,7 @@
* This is probably the last program in the `sysinstall' line - the next
* generation being essentially a complete rewrite.
*
- * $Id: install.c,v 1.91 1996/04/29 06:47:09 jkh Exp $
+ * $Id: install.c,v 1.92 1996/04/29 19:34:25 jkh Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
@@ -297,11 +297,13 @@ installExpress(dialogMenuItem *self)
return i;
if (!Dists) {
+ dialog_clear();
if (!dmenuOpenSimple(&MenuDistributions) && !Dists)
return DITEM_FAILURE | DITEM_RESTORE | DITEM_RECREATE;
}
if (!mediaDevice) {
+ dialog_clear();
if (!dmenuOpenSimple(&MenuMedia) || !mediaDevice)
return DITEM_FAILURE | DITEM_RESTORE | DITEM_RECREATE;
}
@@ -357,8 +359,8 @@ installNovice(dialogMenuItem *self)
break;
}
- dialog_clear();
if (!mediaDevice) {
+ dialog_clear();
msgConfirm("Finally, you must specify an installation medium.");
if (!dmenuOpenSimple(&MenuMedia) || !mediaDevice)
return DITEM_FAILURE | DITEM_RESTORE | DITEM_RECREATE;
@@ -374,7 +376,7 @@ installNovice(dialogMenuItem *self)
}
else
- msgConfirm("Congradulations! You now have FreeBSD installed on your system.\n"
+ msgConfirm("Congradulations! You now have FreeBSD installed on your system.\n\n"
"We will now move on to the final configuration questions.\n"
"For any option you do not wish to configure, simply select\n"
"Cancel.\n\n"
@@ -413,8 +415,12 @@ installNovice(dialogMenuItem *self)
if (!msgYesNo("Do you want to configure this machine as a WEB server?"))
configApache(self);
- if (!msgYesNo("Would you like to customize your system console settings?"))
+ if (!msgYesNo("Would you like to customize your system console settings?")) {
+ WINDOW *w = savescr();
+
dmenuOpenSimple(&MenuSyscons);
+ restorescr(w);
+ }
if (!msgYesNo("Would you like to set this machine's time zone now?")) {
WINDOW *w = savescr();
@@ -424,8 +430,12 @@ installNovice(dialogMenuItem *self)
restorescr(w);
}
- if (!msgYesNo("Does this system have a mouse attached to it?"))
+ if (!msgYesNo("Does this system have a mouse attached to it?")) {
+ WINDOW *w = savescr();
+
dmenuOpenSimple(&MenuMouse);
+ restorescr(w);
+ }
if (directory_exists("/usr/X11R6")) {
if (!msgYesNo("Would you like to configure your X server at this time?"))
@@ -513,8 +523,12 @@ installConfigure(void)
{
/* Final menu of last resort */
if (!msgYesNo("Visit the general configuration menu for a chance to set\n"
- "any last options?"))
+ "any last options?")) {
+ WINDOW *w = savescr();
+
dmenuOpenSimple(&MenuConfigure);
+ restorescr(w);
+ }
/* Write out any changes .. */
configResolv();
diff --git a/usr.sbin/sysinstall/system.c b/usr.sbin/sysinstall/system.c
index ff448eb..5a480d3 100644
--- a/usr.sbin/sysinstall/system.c
+++ b/usr.sbin/sysinstall/system.c
@@ -4,7 +4,7 @@
* This is probably the last program in the `sysinstall' line - the next
* generation being essentially a complete rewrite.
*
- * $Id: system.c,v 1.55 1996/04/28 03:27:26 jkh Exp $
+ * $Id: system.c,v 1.56 1996/04/28 20:54:09 jkh Exp $
*
* Jordan Hubbard
*
@@ -277,7 +277,9 @@ systemCreateHoloshell(void)
msgDebug("Was unable to execute sh for Holographic shell!\n");
exit(1);
}
- else
+ else {
msgNotify("Starting an emergency holographic shell on VTY4");
+ sleep(1);
+ }
}
}
OpenPOWER on IntegriCloud