aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJordan K. Hubbard <jkh@FreeBSD.org>1994-11-21 10:51:15 +0000
committerJordan K. Hubbard <jkh@FreeBSD.org>1994-11-21 10:51:15 +0000
commit32cd2733727195cb433693765760f4e797fd3342 (patch)
treecf0d59b11e6ac4dda267b6bff2f9df4cb922f664
parent92c9323d3b7d0c79ed446c63c43163ea83331883 (diff)
downloadsrc-32cd2733727195cb433693765760f4e797fd3342.tar.gz
src-32cd2733727195cb433693765760f4e797fd3342.zip
Put the cursor back in the right place.
Pretty up the help text.
Notes
Notes: svn path=/releng/BETA_2_0/; revision=4752
-rw-r--r--sbin/sysinstall/mbr.c7
-rw-r--r--sbin/sysinstall/stage1.c58
2 files changed, 37 insertions, 28 deletions
diff --git a/sbin/sysinstall/mbr.c b/sbin/sysinstall/mbr.c
index f78d1521f186..750b731cc2f5 100644
--- a/sbin/sysinstall/mbr.c
+++ b/sbin/sysinstall/mbr.c
@@ -301,18 +301,17 @@ Fdisk()
mvprintw(20, 0, "Commands available: ");
mvprintw(21, 0, "(H)elp (T)utorial (D)elete (E)dit (R)eread (W)rite MBR (Q)uit");
mvprintw(22, 0, "(U)se entire disk for FreeBSD (G)eometry Write MBR (B)ootcode");
- mvprintw(23, 0, "Enter Command> ");
- move(24,0);
if (grumble) {
standout();
- printw(grumble);
+ mvprintw(24, 0, grumble);
standend();
grumble = NULL;
} else if (changed) {
standout();
- printw("Use (W)rite to save changes to disk");
+ mvprintw(24, 0, "Use (W)rite to save changes to disk");
standend();
}
+ mvprintw(23, 0, "Enter Command> ");
i=getch();
switch(i) {
diff --git a/sbin/sysinstall/stage1.c b/sbin/sysinstall/stage1.c
index eaf85c7ed7ef..6f78eedc4d07 100644
--- a/sbin/sysinstall/stage1.c
+++ b/sbin/sysinstall/stage1.c
@@ -89,31 +89,41 @@ stage1()
clear(); standend();
j = 2;
if (fixit) {
- mvprintw(j++, 50, "Suggested course of action:"); j++;
- mvprintw(j++, 50, "(F)disk, (W)rite");
- mvprintw(j++, 50, "possibly (F)disk, (B)oot");
- mvprintw(j++, 50, "(D)isklabel, (A)ssign <root>");
- mvprintw(j++, 50, " (A)ssign swap");
- mvprintw(j++, 50, "(P)roceed");
- mvprintw(j++, 50, "Reboot");
- mvprintw(j++, 50, "Load cpio floppy");
- mvprintw(j++, 50, "Choose stand-alone shell"); j++;
- mvprintw(j++, 50, "Your kernel and /etc/fstab");
- mvprintw(j++, 50, "are backed up and /sbin/init");
- mvprintw(j++, 50, "is renamed");
-
+ mvprintw(j++, 50, "|Suggested course of action:");
+ mvprintw(j++, 50, "|");
+ mvprintw(j++, 50, "|(F)disk, (W)rite");
+ mvprintw(j++, 50, "|possibly (F)disk, (B)oot");
+ mvprintw(j++, 50, "|(D)isklabel, (A)ssign <root>");
+ mvprintw(j++, 50, "|(A)ssign swap");
+ mvprintw(j++, 50, "|(P)roceed");
+ mvprintw(j++, 50, "|Reboot");
+ mvprintw(j++, 50, "|Load cpio floppy");
+ mvprintw(j++, 50, "|Choose stand-alone shell");
+ mvprintw(j++, 50, "|");
+ mvprintw(j++, 50, "|Your kernel and /etc/fstab");
+ mvprintw(j++, 50, "|are backed up and /sbin/init");
+ mvprintw(j++, 50, "|is renamed");
} else {
- mvprintw(j++, 50, "You must assign some space to");
- mvprintw(j++, 50, "a root (/), swap, and");
- mvprintw(j++, 50, "optionally, a /usr partition."); j++;
- mvprintw(j++, 50, "Root should be a minimum of");
- mvprintw(j++, 50, "18MB with a 30MB /usr, or");
- mvprintw(j++, 50, "50MB without a /usr."); j++;
- mvprintw(j++, 50, "Swap space should be a");
- mvprintw(j++, 50, "minimum of 12MB or MEM * 2.");
- mvprintw(j++, 50, "Also be sure to Assign");
- mvprintw(j++, 50, "mount points to each or");
- mvprintw(j++, 50, "they will NOT be enabled."); j++;
+ mvprintw(j++, 50, "|You must assign some space");
+ mvprintw(j++, 50, "|to a root (/), swap, and");
+ mvprintw(j++, 50, "|optionally a /usr partition");
+ mvprintw(j++, 50, "|");
+ mvprintw(j++, 50, "|Root should be a minimum of");
+ mvprintw(j++, 50, "|18MB with a 30MB /usr, or");
+ mvprintw(j++, 50, "|50MB without a /usr.");
+ mvprintw(j++, 50, "|");
+ mvprintw(j++, 50, "|Swap space should be a");
+ mvprintw(j++, 50, "|minimum of 12MB or MEM * 2");
+ mvprintw(j++, 50, "|Also be sure to Assign");
+ mvprintw(j++, 50, "|mount points to each or");
+ mvprintw(j++, 50, "|they will NOT be enabled.");
+ mvprintw(j++, 50, "|");
+ mvprintw(j++, 50, "|We suggest that you invoke");
+ mvprintw(j++, 50, "|(F)disk, then (D)isklabel");
+ mvprintw(j++, 50, "|in setting up your disk.");
+ mvprintw(j++, 50, "|If installing on a drive");
+ mvprintw(j++, 50, "|other than 0, read the");
+ mvprintw(j++, 50, "|troubleshooting doc first");
}
j = 0;