Add auto-fill-on-delete. When deleting an 'A'uto created partition

sysinstall will automatically expand the previous partition to take up
the freed up space.  So you can 'D'elete /home and /usr will get the
combined space, or you can 'D'elete /tmp and /var will get the combined space.

This gives the user, developer, or lay person a huge amount of flexibility
in constructing partitions from an 'A'uto base.  It takes only 3 or 4
keystrokes to achieve virtually any combination of having or not having
a /tmp and/or /home after doing an 'A'uto create.

Change 'A'uto creation of /var/tmp to 'A'uto creation /tmp, which should
be less controversial.

MFC after:	6 days

1 files changed, 12 insertions, 12 deletions

diff --git a/usr.sbin/sade/install.c b/usr.sbin/sade/install.c
index 468b202..27dc295 100644
--- a/usr.sbin/sade/install.c
+++ b/usr.sbin/sade/install.c
@@ -66,12 +66,12 @@ static void	fixit_common(void);
 static void	installConfigure(void);
 
 Boolean
-checkLabels(Boolean whinge, Chunk **rdev, Chunk **sdev, Chunk **udev, Chunk **vdev, Chunk **vtdev, Chunk **hdev)
+checkLabels(Boolean whinge, Chunk **rdev, Chunk **sdev, Chunk **udev, Chunk **vdev, Chunk **tdev, Chunk **hdev)
 {
     Device **devs;
     Boolean status;
     Disk *disk;
-    Chunk *c1, *c2, *rootdev, *swapdev, *usrdev, *vardev, *vartmpdev, *homedev;
+    Chunk *c1, *c2, *rootdev, *swapdev, *usrdev, *vardev, *tmpdev, *homedev;
     int i;
 
     /* Don't allow whinging if noWarn is set */
@@ -87,11 +87,11 @@ checkLabels(Boolean whinge, Chunk **rdev, Chunk **sdev, Chunk **udev, Chunk **vd
 	*udev = NULL;
     if (vdev)
 	*vdev = NULL;
-    if (vtdev)
-	*vtdev = NULL;
+    if (tdev)
+	*tdev = NULL;
     if (hdev)
 	*hdev = NULL;
-    rootdev = swapdev = usrdev = vardev = vartmpdev = homedev = NULL;
+    rootdev = swapdev = usrdev = vardev = tmpdev = homedev = NULL;
 
     /* We don't need to worry about root/usr/swap if we're already multiuser */
     if (!RunningAsInit)
@@ -148,17 +148,17 @@ checkLabels(Boolean whinge, Chunk **rdev, Chunk **sdev, Chunk **udev, Chunk **vd
 				if (isDebug())
 				    msgDebug("Found vardev at %s!\n", vardev->name);
 			    }
-			} else if (!strcmp(((PartInfo *)c2->private_data)->mountpoint, "/var/tmp")) {
-			    if (vartmpdev) {
+			} else if (!strcmp(((PartInfo *)c2->private_data)->mountpoint, "/tmp")) {
+			    if (tmpdev) {
 				if (whinge)
-				    msgConfirm("WARNING:  You have more than one /var/tmp filesystem.\n"
+				    msgConfirm("WARNING:  You have more than one /tmp filesystem.\n"
 					       "Using the first one found.");
 				continue;
 			    }
 			    else {
-				vartmpdev = c2;
+				tmpdev = c2;
 				if (isDebug())
-				    msgDebug("Found vartmpdev at %s!\n", vartmpdev->name);
+				    msgDebug("Found tmpdev at %s!\n", tmpdev->name);
 			    }
 			} else if (!strcmp(((PartInfo *)c2->private_data)->mountpoint, "/home")) {
 			    if (homedev) {
@@ -210,8 +210,8 @@ checkLabels(Boolean whinge, Chunk **rdev, Chunk **sdev, Chunk **udev, Chunk **vd
 	*udev = usrdev;
     if (vdev)
 	*vdev = vardev;
-    if (vtdev)
-	*vtdev = vartmpdev;
+    if (tdev)
+	*tdev = tmpdev;
     if (hdev)
 	*hdev = homedev;