diff options
author | jkh <jkh@FreeBSD.org> | 1994-11-07 13:48:54 +0000 |
---|---|---|
committer | jkh <jkh@FreeBSD.org> | 1994-11-07 13:48:54 +0000 |
commit | b3497d7fb9c58130e1e89c6870d9cab726604aba (patch) | |
tree | 29f22fc8855fd01da6aeb3c430ad7b054155e933 | |
parent | 385734ebee96c60e64922621458a69472935f055 (diff) | |
download | FreeBSD-src-b3497d7fb9c58130e1e89c6870d9cab726604aba.zip FreeBSD-src-b3497d7fb9c58130e1e89c6870d9cab726604aba.tar.gz |
My last cosmetic changes.
-rw-r--r-- | sbin/sysinstall/stage0.c | 13 | ||||
-rw-r--r-- | sbin/sysinstall/stage5.c | 5 | ||||
-rw-r--r-- | sbin/sysinstall/utils.c | 3 |
3 files changed, 8 insertions, 13 deletions
diff --git a/sbin/sysinstall/stage0.c b/sbin/sysinstall/stage0.c index 7bfffb4..37f07d9 100644 --- a/sbin/sysinstall/stage0.c +++ b/sbin/sysinstall/stage0.c @@ -44,12 +44,9 @@ stage0() { evil_goto: if (dialog_menu("Welcome to FreeBSD!", - "Please select one of the following options:", - 15, 75, 6, 6, welcome, selection)) { - dialog_clear(); - end_dialog(); - reboot(RB_AUTOBOOT); - } + "Use ALT-F2 and ALT-F1 to toggle between debugging\ninformation screen (ALT-F2) or this dialog screen (ALT-F1)\n\nPlease select one of the following options:", 15, 75, 6, 6, welcome, selection)) + ExitSysinstall(); + switch (atoi(selection)) { case 1: /* View the README */ ShowFile(README_FILE, "Read Me First"); @@ -77,9 +74,7 @@ evil_goto: case 6: /* Be neat.. */ - dialog_clear(); - end_dialog(); - reboot(RB_AUTOBOOT); + ExitSysinstall(); break; /* hope not! :) */ } } diff --git a/sbin/sysinstall/stage5.c b/sbin/sysinstall/stage5.c index df64bee..ac3e5a0 100644 --- a/sbin/sysinstall/stage5.c +++ b/sbin/sysinstall/stage5.c @@ -6,7 +6,7 @@ * this stuff is worth it, you can buy me a beer in return. Poul-Henning Kamp * ---------------------------------------------------------------------------- * - * $Id: stage5.c,v 1.10 1994/11/06 02:24:45 jkh Exp $ + * $Id: stage5.c,v 1.11 1994/11/07 09:49:06 jkh Exp $ * */ @@ -36,8 +36,7 @@ stage5() { int exec_sh = 1; - if (!dialog_yesno("End of initial installation", msg, - strheight(msg) + 4, strwidth(msg) + 4)) + if (!dialog_yesno("End of initial installation", msg, 15, 76)) exec_sh = 0; end_dialog(); dialog_active=0; diff --git a/sbin/sysinstall/utils.c b/sbin/sysinstall/utils.c index 0e592c7..7999c30 100644 --- a/sbin/sysinstall/utils.c +++ b/sbin/sysinstall/utils.c @@ -6,7 +6,7 @@ * this stuff is worth it, you can buy me a beer in return. Poul-Henning Kamp * ---------------------------------------------------------------------------- * - * $Id: utils.c,v 1.24 1994/11/05 23:09:26 ache Exp $ + * $Id: utils.c,v 1.25 1994/11/07 04:53:23 phk Exp $ * */ @@ -93,6 +93,7 @@ TellEm(char *fmt, ...) write(debug_fd,p,strlen(p)); write(debug_fd,">\n\r",3); dialog_clear(); + dialog_update(); dialog_msgbox("Progress", p, strheight(p)+2, strwidth(p)+4, 0); free(p); } |