Add various missing seat belts.

4 files changed, 41 insertions, 19 deletions

diff --git a/release/sysinstall/install.c b/release/sysinstall/install.c
index 381e09a..b0d276a 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.63 1995/05/28 09:31:32 jkh Exp $
+ * $Id: install.c,v 1.64 1995/05/28 20:28:13 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -108,6 +108,10 @@ checkLabels(void)
 	msgConfirm("No root device found - you must label a partition as /\n in the label editor.");
 	return FALSE;
     }
+    else if (rootdev->name[strlen(rootdev->name) - 1] != 'a') {
+	msgConfirm("Invalid placement of root partition.  For now, we only support\nmounting root partitions on \"a\" partitions due to limitations\nin the FreeBSD boot block code.  Please correct this and\ntry again.");
+	return FALSE;
+    }
     if (!swapdev) {
 	msgConfirm("No swap devices found - you must create at least one\nswap partition.");
 	return FALSE;
@@ -206,8 +210,6 @@ installInitial(void)
 	execlp("sh", "-sh", 0);
 	exit(1);
     }
-    /* Copy the /etc files into their rightful place */
-    vsystem("(cd /stand; find etc | cpio -o) | (cd /; cpio -idmv)");
     root_extract();
     alreadyDone = TRUE;
     return TRUE;
@@ -370,8 +372,9 @@ copy_self(void)
     i = vsystem("find -x /stand | cpio -pdmV /mnt");
     if (i)
 	msgConfirm("Copy returned error status of %d!", i);
-    /* copy up the etc files */
-    (void)vsystem("(cd /mnt/stand; find etc) | cpio -pdmv /mnt");
+
+    /* Copy the /etc files into their rightful place */
+    (void)vsystem("(cd /stand; find etc) | cpio -pdmv /mnt");
 }
 
 static void loop_on_root_floppy();
diff --git a/release/sysinstall/label.c b/release/sysinstall/label.c
index fa95bfe..a124cea 100644
--- a/release/sysinstall/label.c
+++ b/release/sysinstall/label.c
@@ -4,7 +4,7 @@
  * This is probably the last program in the `sysinstall' line - the next
  * generation being essentially a complete rewrite.
  *
- * $Id: label.c,v 1.27 1995/05/28 09:31:34 jkh Exp $
+ * $Id: label.c,v 1.28 1995/05/28 20:28:15 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -399,11 +399,12 @@ print_command_summary()
 int
 diskLabelEditor(char *str)
 {
-    int sz, key = 0;
+    int sz, i, key = 0;
     Boolean labeling;
     char *msg = NULL;
     PartInfo *p;
     PartType type;
+    Device **devs;
 
     labeling = TRUE;
     keypad(stdscr, TRUE);
@@ -468,6 +469,18 @@ diskLabelEditor(char *str)
 		msg = "You can only do this in a master partition (see top of screen)";
 		break;
 	    }
+	    else {
+		int i, cnt;
+
+		cnt = i = 0;
+		while (label_chunk_info[i].c)
+		    if (label_chunk_info[i++].type != PART_SLICE)
+			cnt++;
+		if (cnt == (CHUNK_COLUMN_MAX * 2)) {
+		    msgConfirm("Sorry, I can't fit any more partitions on the screen!  You can get around\nthis limitation by partitioning your disks individually rather than all\nat once.  This will be fixed just as soon as we get a scrolling partition\nbox written.  Sorry for the inconvenience!");
+		    break;
+		}
+	    }
 	    sz = space_free(label_chunk_info[here].c);
 	    if (sz <= FS_MIN_SIZE) {
 		msg = "Not enough space to create additional FreeBSD partition";
@@ -609,11 +622,19 @@ diskLabelEditor(char *str)
 	    break;
 
 	case 'U':
-	    Free_Disk(label_chunk_info[here].c->disk);
-	    label_chunk_info[here].c->disk = Open_Disk(label_chunk_info[here].c->disk->name);
-	    if (!label_chunk_info[here].c->disk)
-		msgFatal("Can't reopen disk in undo!");
+	    devs = deviceFind(NULL, DEVICE_TYPE_DISK);
+	    for (i = 0; devs[i]; i++) {
+		if (!devs[i]->enabled)
+		    continue;
+		else {
+		    char *cp = devs[i]->name;
+
+		    Free_Disk(devs[i]->private);
+		    devs[i]->private = Open_Disk(cp);
+		}
+	    }
 	    record_label_chunks();
+	    break;
 
 	case 'W':
 	    if (!msgYesNo("Are you sure you want to go into Wizard mode?\n\nThis is an entirely undocumented feature which you are not\nexpected to understand!")) {
diff --git a/release/sysinstall/menus.c b/release/sysinstall/menus.c
index dc256d4..9a11719 100644
--- a/release/sysinstall/menus.c
+++ b/release/sysinstall/menus.c
@@ -4,7 +4,7 @@
  * This is probably the last program in the `sysinstall' line - the next
  * generation being essentially a complete rewrite.
  *
- * $Id: menus.c,v 1.34 1995/05/27 10:47:38 jkh Exp $
+ * $Id: menus.c,v 1.35 1995/05/28 09:31:37 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -673,8 +673,6 @@ aspects of your system's network configuration.",
 	DMENU_SET_VARIABLE, "nfs_client=YES", 0, 0		},
       { "NFS server",	"This machine will be an NFS server",
 	DMENU_SET_VARIABLE, "nfs_server=YES", 0, 0		},
-      { "gated",	"This machine wants to run gated",
-	DMENU_SET_VARIABLE, "gated=YES", 0, 0			},
       { "interfaces",	"Configure additional interfaces",
 	DMENU_CALL,	tcpDeviceSelect, 0, 0			},
       { "ntpdate",	"Select a clock-syncronization server",
@@ -748,7 +746,7 @@ select Cancel.",
 	DMENU_SUBMENU, &MenuSysconsKeymap, 0, 0		},
       { "Repeat", "Set the rate at which keys repeat",
 	DMENU_SUBMENU, &MenuSysconsKeyrate, 0, 0	},
-      { "Saver", "Select a screen saver",
+      { "Saver", "Configure the screen saver",
 	DMENU_SUBMENU, &MenuSysconsSaver, 0, 0		},
       { NULL } },
 };
@@ -792,7 +790,7 @@ the other keymaps below.",
 };
 
 DMenu MenuSysconsKeyrate = {
-    DMENU_NORMAL_TYPE,
+    DMENU_NORMAL_TYPE | DMENU_SELECTION_RETURNS,
     "System Console Keyboard Repeat Rate",
     "This menu allows you to set the speed at which keys repeat\n\
 when held down.",
@@ -810,7 +808,7 @@ when held down.",
 };
 
 DMenu MenuSysconsSaver = {
-    DMENU_NORMAL_TYPE | DMENU_SELECTION_RETURNS,
+    DMENU_NORMAL_TYPE,
     "System Console Screen Saver",
     "By default, the console driver will not attempt to do anything\n\
 special with your screen when it's idle.  If you expect to leave your\n\
diff --git a/release/sysinstall/tcpip.c b/release/sysinstall/tcpip.c
index 76ae079..04166c7 100644
--- a/release/sysinstall/tcpip.c
+++ b/release/sysinstall/tcpip.c
@@ -1,5 +1,5 @@
 /*
- * $Id: tcpip.c,v 1.24 1995/05/28 03:05:06 jkh Exp $
+ * $Id: tcpip.c,v 1.25 1995/05/28 09:31:44 jkh Exp $
  *
  * Copyright (c) 1995
  *      Gary J Palmer. All rights reserved.
@@ -197,7 +197,7 @@ tcpOpenDialog(Device *devp)
     draw_box(ds_win, TCP_DIALOG_Y, TCP_DIALOG_X, TCP_DIALOG_HEIGHT, TCP_DIALOG_WIDTH, dialog_attr, border_attr);
     wattrset(ds_win, dialog_attr);
     sprintf(title, " Interface %s ", devp->name);
-    mvwaddstr(ds_win, TCP_DIALOG_Y, TCP_DIALOG_X + 20, title);
+    mvwaddstr(ds_win, TCP_DIALOG_Y, TCP_DIALOG_X + 22, title);
     draw_box(ds_win, TCP_DIALOG_Y + 9, TCP_DIALOG_X + 8, TCP_DIALOG_HEIGHT - 13, TCP_DIALOG_WIDTH - 17,
 	     dialog_attr, border_attr);
     wattrset(ds_win, dialog_attr);