make note of which /etc files need upgrading in installUpgrade rather

than asking the user to keep track of the list himself.

5 files changed, 83 insertions, 85 deletions

diff --git a/usr.sbin/sade/help/slice.hlp b/usr.sbin/sade/help/slice.hlp
index 40e4d49..ecfcf1e 100644
--- a/usr.sbin/sade/help/slice.hlp
+++ b/usr.sbin/sade/help/slice.hlp
@@ -12,25 +12,6 @@ swap, file systems, etc.  The usual convention is to create ONE
 FreeBSD partition per drive and then subsection this partition into
 swap and file systems with the Label editor.
 
-
-The flags field has the following legend:
-
-        '='  -- This partition is properly aligned.
-        '>'  -- This partition doesn't end before cylinder 1024
-        'R'  -- This partition contains the root (/) filesystem
-        'B'  -- Partition employs BAD144 bad-spot handling
-        'C'  -- This is the FreeBSD 2.0-compatibility partition (default)
-        'A'  -- This partition is marked active.
-
-If you select a partition for Bad144 handling, it will be scanned
-for bad blocks before any new filesystems are made on it.
-
-If no partition is marked Active, you will need to either install
-a Boot Manager (the option for which will be presented later in the
-installation) or set one Active before leaving this screen.
-
-To leave the partition editor, type `Q'.
-
 No actual changes will be made to the disk until you (C)ommit from the
 Install menu or use the (W)rite option here!  You're working with what
 is essentially a copy of the disk label(s), both here and in the Label
@@ -58,3 +39,21 @@ or anything else that has to interact with the BIOS.  This option is
 therefore only considered safe for SCSI disks and most IDE disks and
 is primarily intented for people who are going to set up a dedicated
 FreeBSD server or workstation, not a typical `home PC'.
+
+The flags field has the following legend:
+
+        '='  -- This partition is properly aligned.
+        '>'  -- This partition doesn't end before cylinder 1024
+        'R'  -- This partition contains the root (/) filesystem
+        'B'  -- Partition employs BAD144 bad-spot handling
+        'C'  -- This is the FreeBSD 2.0-compatibility partition (default)
+        'A'  -- This partition is marked active.
+
+If you select a partition for Bad144 handling, it will be scanned
+for bad blocks before any new filesystems are made on it.
+
+If no partition is marked Active, you will need to either install
+a Boot Manager (the option for which will be presented later in the
+installation) or set one Active before leaving this screen.
+
+To leave the partition editor, type `Q'.
diff --git a/usr.sbin/sysinstall/help/slice.hlp b/usr.sbin/sysinstall/help/slice.hlp
index 40e4d49..ecfcf1e 100644
--- a/usr.sbin/sysinstall/help/slice.hlp
+++ b/usr.sbin/sysinstall/help/slice.hlp
@@ -12,25 +12,6 @@ swap, file systems, etc.  The usual convention is to create ONE
 FreeBSD partition per drive and then subsection this partition into
 swap and file systems with the Label editor.
 
-
-The flags field has the following legend:
-
-        '='  -- This partition is properly aligned.
-        '>'  -- This partition doesn't end before cylinder 1024
-        'R'  -- This partition contains the root (/) filesystem
-        'B'  -- Partition employs BAD144 bad-spot handling
-        'C'  -- This is the FreeBSD 2.0-compatibility partition (default)
-        'A'  -- This partition is marked active.
-
-If you select a partition for Bad144 handling, it will be scanned
-for bad blocks before any new filesystems are made on it.
-
-If no partition is marked Active, you will need to either install
-a Boot Manager (the option for which will be presented later in the
-installation) or set one Active before leaving this screen.
-
-To leave the partition editor, type `Q'.
-
 No actual changes will be made to the disk until you (C)ommit from the
 Install menu or use the (W)rite option here!  You're working with what
 is essentially a copy of the disk label(s), both here and in the Label
@@ -58,3 +39,21 @@ or anything else that has to interact with the BIOS.  This option is
 therefore only considered safe for SCSI disks and most IDE disks and
 is primarily intented for people who are going to set up a dedicated
 FreeBSD server or workstation, not a typical `home PC'.
+
+The flags field has the following legend:
+
+        '='  -- This partition is properly aligned.
+        '>'  -- This partition doesn't end before cylinder 1024
+        'R'  -- This partition contains the root (/) filesystem
+        'B'  -- Partition employs BAD144 bad-spot handling
+        'C'  -- This is the FreeBSD 2.0-compatibility partition (default)
+        'A'  -- This partition is marked active.
+
+If you select a partition for Bad144 handling, it will be scanned
+for bad blocks before any new filesystems are made on it.
+
+If no partition is marked Active, you will need to either install
+a Boot Manager (the option for which will be presented later in the
+installation) or set one Active before leaving this screen.
+
+To leave the partition editor, type `Q'.
diff --git a/usr.sbin/sysinstall/help/usage.hlp b/usr.sbin/sysinstall/help/usage.hlp
index 64b7c34..c0b90fc 100644
--- a/usr.sbin/sysinstall/help/usage.hlp
+++ b/usr.sbin/sysinstall/help/usage.hlp
@@ -1,14 +1,16 @@
 HOW TO USE THIS SYSTEM
 ======================
 
+[press the PageDown key to go to the next screen when you finish
+ reading this one]
+
 The following keys are recognised in most of the dialogs you'll
-encounter during this installation [press the PageDown key to go
-to the next screen when you finish reading this one]:
+encounter during this installation:
 
 KEY             ACTION
 ---             ------
 SPACE           Select or toggle the current item.
-RETURN          Finish with an item.
+RETURN          Finish with a menu or item.
 UP ARROW        Move to previous item (or up, in a text display box).
 DOWN ARROW      Move to next item (or down, in a text display box).
 TAB             Move to next item or group.
@@ -20,13 +22,11 @@ PAGE DOWN       In text display boxes, scrolls down one page.
 
 If you see small "^(-)" or "v(+)" symbols at the edges of a menu, it
 means that there are more items above or below the current one that
-aren't being shown (due to insufficient screen space).  Using the
-up/down arrow keys will cause the menu to scroll.  The PageUp and
-PageDown keys will scroll by entire screens.
-
-In text display boxes, the amount of text above the current point will be
-displayed as a percentage in the lower right corner.  A value of
-100% means that you're at the bottom of the displayed text.
+aren't being shown (due to insufficient screen space).  In text
+display boxes, the amount of text above the current point will be
+displayed as a percentage in the lower right corner.  Using the
+Up/Down arrow keys will cause the object to scroll by line.  The
+PageUp and PageDown keys will scroll by entire screens.
 
 Selecting OK in a menu will confirm whatever action it's controlling.
 Selecting Cancel will cancel the operation and generally return you to
@@ -36,25 +36,24 @@ the previous menu.
 SPECIAL FEATURES:
 =================
 
-It is also possible to select a menu item by typing the first
-character of its name, if unique.  This will generally be an
-item number.
-
-The console driver also contains a scroll-back buffer for reviewing
-things that may have scrolled off the screen.  To use scroll-back,
-press the "Scroll Lock" key on your keyboard and use the arrow or Page
-Up/Page Down keys to move through the saved text.  To leave
-scroll-back mode, press the Scroll Lock key again.  This feature is
-most useful for reading back through your boot messages (go ahead, try
-it now!) though it's also useful when dealing with sub-shells or other
-"wizard modes" that don't use menus and tend to scroll their output
-off the top of the screen.
-
-Once the system is fully installed and running multi-user you will
-also find that you have multiple "virtual consoles" and can use them
-to have several active sessions at once.  Use ALT-F<n> to switch
-between them, where `F<n>' is the function key corresponding to the
+It is possible to select a menu item by typing the first character of
+its name, if unique.  This will generally be an item number.
+
+The console driver contains a scroll-back buffer for reviewing things
+that may have scrolled off the screen.  To use scroll-back, press the
+"Scroll Lock" key on your keyboard and use the arrow or Page Up/Page
+Down keys to move through the saved text.  To leave scroll-back mode,
+press the Scroll Lock key again.  This feature is most useful for
+reading back through your boot messages (go ahead, try it now!) though
+it's also useful when dealing with sub-shells or other "wizard modes"
+that don't use menus and tend to scroll their output off the top of
+the screen.
+
+Once the system is fully installed and running multi-user, you will
+find that you have multiple "virtual consoles" which you can use to in
+order to have several active sessions at once.  Use ALT-F<n> to switch
+between screens, where `F<n>' is the function key corresponding to the
 screen you wish to see.  By default, the system comes with 3 virtual
-consoles enabled.  You can enable more by editing the /etc/ttys file
+consoles enabled - you can enable more by editing the /etc/ttys file
 and turning the "off" field to "on" in the relevant vty entries (up to
 12).
diff --git a/usr.sbin/sysinstall/help/usermgmt.hlp b/usr.sbin/sysinstall/help/usermgmt.hlp
index df2bbd0..c46c69f 100644
--- a/usr.sbin/sysinstall/help/usermgmt.hlp
+++ b/usr.sbin/sysinstall/help/usermgmt.hlp
@@ -53,6 +53,11 @@ additional password etc.  Except for the "wheel" case mentioned below,
 the additional group membership list should normally not contain the
 login group again.
 
+The user's password can also be set here, and should be chosen with
+care - 6 or more characters, intermixing punctuation and numerics, and
+*not* a word from the dictionary or related to the username is a good
+password choice.
+
 Some of the system's groups have a special meaning.  In particular,
 members of group "wheel" are the only people who are later allowed to
 become superuser using the command su(1).  So if you're going to add a
@@ -82,15 +87,3 @@ Finally, the shell is the user's initial command interpreter.  The
 default shell is /bin/sh, some users prefer the more historic
 /bin/csh.  Other, often more user-friendly and comfortable shells can
 be found in the ports and packages collection.
-
-
-Passwords
-=========
-
-Note that new users will be established with no allowable password, so
-they cannot login immediately.  Instead, someone with superuser
-privileges has to run the command ``passwd <user>'' (where <user> is
-to be replaced with the actual login name for this user) on behalf of
-the new user, so (s)he can enter his/her password.  Since the password
-won't be echoed on the screen, it must be entered twice.  This should
-never be done across a network, to prevent password-sniffing.
diff --git a/usr.sbin/sysinstall/installUpgrade.c b/usr.sbin/sysinstall/installUpgrade.c
index 5438e8e..d55213a 100644
--- a/usr.sbin/sysinstall/installUpgrade.c
+++ b/usr.sbin/sysinstall/installUpgrade.c
@@ -4,7 +4,7 @@
  * This is probably the last program in the `sysinstall' line - the next
  * generation being essentially a complete rewrite.
  *
- * $Id: installUpgrade.c,v 1.33 1996/10/09 09:53:35 jkh Exp $
+ * $Id: installUpgrade.c,v 1.34 1996/12/08 12:27:55 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -56,23 +56,31 @@ typedef struct _hitList {
 static void
 doByHand(HitList *h)
 {
+    FILE *fp;
+
+    fp = fopen("/etc/update-by-hand", "a");
     msgConfirm("/etc/%s is one of those files that this upgrade procedure just isn't\n"
 	       "smart enough to deal with right now.  You'll need to merge the old and\n"
 	       "new versions by hand when the option to do so manually is later\n"
-	       "presented (in the meantime, you might want to write the name of\n"
-	       "this file down! - the holographic shell on VTY4 is a good place for\n"
-	       "this).", h->name);
+	       "presented.  This has also been noted in the file /etc/update-by-hand.", h->name);
+    fprintf(fp, "/etc/%s\n", h->name);
+    fclose(fp);
 }
 
 static void
 yellSysconfig(HitList *h)
 {
+    FILE *fp;
+
+    fp = fopen("/etc/update-by-hand", "a");
+    fprintf(fp, "/etc/sysconfig\n");
     msgConfirm("/etc/sysconfig is one of those files that this upgrade procedure just isn't\n"
 	       "smart enough to deal with right now.  Unfortunately, your system\n"
 	       "will also come up with a very different \"personality\" than it had\n"
 	       "before if you do not merge at LEAST the hostname and ifconfig lines\n"
 	       "from the old one!  This is very important, so please do this merge\n"
 	       "even if you do no others before the system is allowed to reboot.");
+    fclose(fp);
 }
 
 /* These are the only meaningful files I know about */
@@ -200,7 +208,7 @@ installUpgrade(dialogMenuItem *self)
     /* No bin selected?  Not much of an upgrade.. */
     if (!(Dists & DIST_BIN)) {
 	if (msgYesNo("You didn't select the bin distribution as one of the distributons to load.\n"
-		     "This one is pretty vital to a successful 2.1 upgrade.  Are you SURE you don't\n"
+		     "This one is pretty vital to a successful upgrade.  Are you SURE you don't\n"
 		     "want to select the bin distribution?  Chose _No_ to bring up the Distributions\n"
 		     "menu.") != 0) {
 	    if (!dmenuOpenSimple(&MenuDistributions, FALSE))
@@ -249,7 +257,7 @@ installUpgrade(dialogMenuItem *self)
 		   "step.");
 
 	if (DITEM_STATUS(diskLabelEditor(self)) == DITEM_FAILURE) {
-	    msgConfirm("The disk label editor failed to work properly!  Upgrade operation\n"
+	    msgConfirm("The disk label editor returned an error status.  Upgrade operation\n"
 		       "aborted.");
 	    return DITEM_FAILURE | DITEM_RECREATE;
 	}