MF22: catch up with recent changes.

3 files changed, 20 insertions, 4 deletions

diff --git a/release/sysinstall/disks.c b/release/sysinstall/disks.c
index 8727f69..5297551 100644
--- a/release/sysinstall/disks.c
+++ b/release/sysinstall/disks.c
@@ -4,7 +4,7 @@
  * This is probably the last program in the `sysinstall' line - the next
  * generation being essentially a complete rewrite.
  *
- * $Id: disks.c,v 1.95 1998/02/13 08:01:01 jkh Exp $
+ * $Id: disks.c,v 1.96 1998/03/19 15:07:20 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -441,8 +441,19 @@ diskPartition(Device *dev)
 		 * disk (i.e., the disklabel starts at sector 0), even in cases where the user has requested
 		 * booteasy or a "standard" MBR -- both would be fatal in this case.
 		 */
-		if (!(d->chunks->part->flags & CHUNK_FORCE_ALL) && (mbrContents = getBootMgr(d->name)) != NULL)
+#if 0
+		if ((d->chunks->part->flags & CHUNK_FORCE_ALL) != CHUNK_FORCE_ALL
+		    && (mbrContents = getBootMgr(d->name)) != NULL)
 		    Set_Boot_Mgr(d, mbrContents);
+#else
+		/*
+		 * Don't offer to update the MBR on this disk if the first "real" chunk looks like
+		 * a FreeBSD "all disk" partition, or the disk is entirely FreeBSD.
+		 */
+		if (((d->chunks->part->type != freebsd) || (d->chunks->part->offset > 1)) &&
+		    (mbrContents = getBootMgr(d->name)) != NULL)
+		    Set_Boot_Mgr(d, mbrContents);
+#endif
 		
 		if (DITEM_STATUS(diskPartitionWrite(NULL)) != DITEM_SUCCESS)
 		    msgConfirm("Disk partition write returned an error status!");
diff --git a/release/sysinstall/index.c b/release/sysinstall/index.c
index 531246c..16a9e83 100644
--- a/release/sysinstall/index.c
+++ b/release/sysinstall/index.c
@@ -4,7 +4,7 @@
  * This is probably the last program in the `sysinstall' line - the next
  * generation being essentially a complete rewrite.
  *
- * $Id: index.c,v 1.51 1997/10/08 15:31:13 jkh Exp $
+ * $Id: index.c,v 1.52 1997/11/13 11:44:42 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -83,6 +83,7 @@ static char *descrs[] = {
     "emulation", "Utilities for emulating other OS types.",
     "emulators", "Utilities for emulating other OS types.",
     "games", "Various and sundry amusements.",
+    "german", "Ported software for Germanic countries.",
     "graphics", "Graphics libraries and utilities.",
     "japanese", "Ported software for the Japanese market.",
     "korean", "Ported software for the Korean market.",
@@ -110,9 +111,12 @@ static char *descrs[] = {
     "textproc", "Text processing/search utilities.",
     "tcl75", "TCL v7.5 and packages which depend on it.",
     "tcl76", "TCL v7.6 and packages which depend on it.",
+    "tcl80", "TCL v8.0 and packages which depend on it.",
+    "tcl81", "TCL v8.1 and packages which depend on it.",
     "tk41", "Tk4.1 and packages which depend on it.",
     "tk42", "Tk4.2 and packages which depend on it.",
     "tk80", "Tk8.0 and packages which depend on it.",
+    "tk81", "Tk8.1 and packages which depend on it.",
     "troff", "TROFF Text formatting utilities.",
     "utils", "Various user utilities.",
     "utilities", "Various user utilities.",
diff --git a/release/sysinstall/mouse.c b/release/sysinstall/mouse.c
index c95f991..76d6c34 100644
--- a/release/sysinstall/mouse.c
+++ b/release/sysinstall/mouse.c
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: mouse.c,v 1.1 1998/03/07 08:59:28 jkh Exp $
+ * $Id: mouse.c,v 1.2 1998/03/10 13:42:05 jkh Exp $
  */
 
 #include "sysinstall.h"
@@ -64,6 +64,7 @@ mousedTest(dialogMenuItem *self)
 		variable_set2(VAR_MOUSED, "NO");
 	} else {
 		variable_set2(VAR_MOUSED, "YES");
+		vsystem("ln -fs /dev/sysmouse /dev/mouse"); /* backwards compat */
 	}
 
 	return DITEM_SUCCESS;