Argh! Moving the media initialization to before the disk scribbling

section was a good thing, since it made it possible to detect media problems
*before* the installation started, but it also caused various things to
be mounted BEFORE the chroot() call, which definitely messes things up.

Fix this by detecting the pre-chroot() case and mounting into a subdir.

1 files changed, 45 insertions, 53 deletions

diff --git a/usr.sbin/sysinstall/cdrom.c b/usr.sbin/sysinstall/cdrom.c
index 5315320..5c8c285 100644
--- a/usr.sbin/sysinstall/cdrom.c
+++ b/usr.sbin/sysinstall/cdrom.c
@@ -51,13 +51,7 @@
 #include <sys/mount.h>
 #undef CD9660
 
-/*
- * This isn't a boolean like the others since we have 3 states for it:
- * 0 = cdrom isn't mounted, 1 = cdrom is mounted and we mounted it, 2 = cdrom
- * was already mounted when we came in and we should leave it that way when
- * we leave.
- */
-static int cdromMounted;
+static Boolean cdromMounted;
 
 Boolean
 mediaInitCDROM(Device *dev)
@@ -66,8 +60,9 @@ mediaInitCDROM(Device *dev)
     Attribs *cd_attr;
     char *cp;
     Boolean readInfo = TRUE;
+    char *mountpoint = (!Chrooted && RunningAsInit) ? "/mnt/dist" : "/dist";
 
-    if (cdromMounted != CD_UNMOUNTED)
+    if (cdromMounted)
 	return TRUE;
 
     bzero(&args, sizeof(args));
@@ -76,44 +71,41 @@ mediaInitCDROM(Device *dev)
 
     cd_attr = alloca(sizeof(Attribs) * MAX_ATTRIBS);
     cp = NULL;
-    /* If this cdrom's not already mounted or can't be mounted, yell */
-    if (!file_readable("/cdrom/cdrom.inf")) {
-	Mkdir("/cdrom");
-	if (mount(MOUNT_CD9660, "/cdrom", MNT_RDONLY, (caddr_t) &args) == -1) {
-	    if (errno == EINVAL) {
-		msgConfirm("The CD in your drive looks more like an Audio CD than a FreeBSD release.");
-		cdromMounted = CD_UNMOUNTED;
-		return FALSE;
-	    }
-	    else if (errno != EBUSY) {
-	    	msgConfirm("Error mounting %s on /cdrom: %s (%u)", dev->devname, strerror(errno), errno);
-		cdromMounted = CD_UNMOUNTED;
-		return FALSE;
-	    }
+
+    Mkdir(mountpoint);
+
+    if (mount(MOUNT_CD9660, mountpoint, MNT_RDONLY, (caddr_t) &args) == -1) {
+	if (errno == EINVAL) {
+	    msgConfirm("The CD in your drive looks more like an Audio CD than a FreeBSD release.");
+	    return FALSE;
+	}
+	else if (errno != EBUSY) {
+	    msgConfirm("Error mounting %s on %s: %s (%u)", dev->devname, mountpoint, strerror(errno), errno);
+	    return FALSE;
 	}
-	if (!file_readable("/cdrom/cdrom.inf")) {
-	    if (msgYesNo("Warning: The CD currently in the drive is either not a FreeBSD\n"
-			 "CD or it is an older (pre 2.1.5) FreeBSD CD which does not\n"
-			 "have a version number on it.  Do you wish to use this CD anyway?") != 0) {
-		unmount("/cdrom", MNT_FORCE);
-		cdromMounted = CD_UNMOUNTED;
-		return FALSE;
-	    }
-	    else
-		readInfo = FALSE;
+	cdromMounted = TRUE;
+    }
+
+    if (!file_readable(string_concat(mountpoint, "/cdrom.inf"))) {
+	if (msgYesNo("Warning: The CD currently in the drive is either not a FreeBSD\n"
+		     "CD or it is an older (pre 2.1.5) FreeBSD CD which does not\n"
+		     "have a version number on it.  Do you wish to use this CD anyway?") != 0) {
+	    unmount(mountpoint, MNT_FORCE);
+	    return FALSE;
 	}
-	cdromMounted = CD_WE_MOUNTED_IT;
+	else
+	    readInfo = FALSE;
     }
-    else
-	cdromMounted = CD_ALREADY_MOUNTED;
-    if (readInfo && (DITEM_STATUS(attr_parse_file(cd_attr, "/cdrom/cdrom.inf")) == DITEM_FAILURE ||
-	!(cp = attr_match(cd_attr, "CD_VERSION")) || strcmp(cp, variable_get(VAR_RELNAME)))) {
+
+    if (readInfo &&
+	(DITEM_STATUS(attr_parse_file(cd_attr, string_concat(mountpoint, "/cdrom.inf"))) == DITEM_FAILURE ||
+		      !(cp = attr_match(cd_attr, "CD_VERSION")) || strcmp(cp, variable_get(VAR_RELNAME)))) {
 	if (!cp)
-	    msgConfirm("Unable to find a /cdrom/cdrom.inf file.\n"
+	    msgConfirm("Unable to find a %s/cdrom.inf file.\n"
 		       "Either this is not a FreeBSD CDROM, there is a problem with\n"
 		       "the CDROM driver or something is wrong with your hardware.\n"
 		       "Please fix this problem (check the console logs on VTY2) and\n"
-		       "try again.");
+		       "try again.", mountpoint);
 	else
 	    msgConfirm("Warning: The version of the FreeBSD CD currently in the drive\n"
 		       "(%s) does not match the version of the boot floppy\n"
@@ -124,12 +116,12 @@ mediaInitCDROM(Device *dev)
 		       "installation media.", cp, variable_get(VAR_RELNAME));
 
 	if (msgYesNo("Would you like to try and use this CDROM anyway?") != 0) {
-	    unmount("/cdrom", MNT_FORCE);
-	    cdromMounted = CD_UNMOUNTED;
+	    unmount(mountpoint, MNT_FORCE);
+	    cdromMounted = FALSE;
 	    return FALSE;
 	}
     }
-    msgDebug("Mounted FreeBSD CDROM on device %s as /cdrom\n", dev->devname);
+    msgDebug("Mounted FreeBSD CDROM from device %s\n", dev->devname);
     return TRUE;
 }
 
@@ -140,31 +132,31 @@ mediaGetCDROM(Device *dev, char *file, Boolean probe)
 
     if (isDebug())
 	msgDebug("Request for %s from CDROM\n", file);
-    snprintf(buf, PATH_MAX, "/cdrom/%s", file);
+    snprintf(buf, PATH_MAX, "/dist/%s", file);
     if (file_readable(buf))
 	return fopen(buf, "r");
-    snprintf(buf, PATH_MAX, "/cdrom/dists/%s", file);
+    snprintf(buf, PATH_MAX, "/dist/dists/%s", file);
     if (file_readable(buf))
 	return fopen(buf, "r");
-    snprintf(buf, PATH_MAX, "/cdrom/%s/%s", variable_get(VAR_RELNAME), file);
+    snprintf(buf, PATH_MAX, "/dist/%s/%s", variable_get(VAR_RELNAME), file);
     if (file_readable(buf))
 	return fopen(buf, "r");
-    snprintf(buf, PATH_MAX, "/cdrom/%s/dists/%s", variable_get(VAR_RELNAME), file);
+    snprintf(buf, PATH_MAX, "/dist/%s/dists/%s", variable_get(VAR_RELNAME), file);
     return fopen(buf, "r");
 }
 
 void
 mediaShutdownCDROM(Device *dev)
 {
-    if (cdromMounted == CD_UNMOUNTED)
+    char *mountpoint = (!Chrooted && RunningAsInit) ? "/mnt/dist" : "/dist";
+
+    if (!cdromMounted)
 	return;
-    msgDebug("Unmounting %s from /cdrom\n", dev->devname);
-    if (unmount("/cdrom", MNT_FORCE) != 0) {
-	msgConfirm("Could not unmount the CDROM from /cdrom: %s", strerror(errno));
-	cdromMounted = CD_ALREADY_MOUNTED;	/* Guess somebody else got it */
-    }
+    msgDebug("Unmounting %s from %s\n", dev->devname, mountpoint);
+    if (unmount(mountpoint, MNT_FORCE) != 0)
+	msgConfirm("Could not unmount the CDROM from %s: %s", mountpoint, strerror(errno));
     else {
 	msgDebug("Unmount of CDROM successful\n");
-	cdromMounted = CD_UNMOUNTED;
+	cdromMounted = FALSE;
     }
 }