diff options
| author | murray <murray@FreeBSD.org> | 2001-09-05 02:30:50 +0000 |
|---|---|---|
| committer | murray <murray@FreeBSD.org> | 2001-09-05 02:30:50 +0000 |
| commit | 409662ce9f9069cc54d18f371f525c1f2e82cb58 (patch) | |
| tree | dbbeadb3b800e0311e2848b95b03790d5f2c8423 /usr.sbin | |
| parent | 34ad4938d7b13071cec2b5866ff9e86958fee591 (diff) | |
| download | FreeBSD-src-409662ce9f9069cc54d18f371f525c1f2e82cb58.zip FreeBSD-src-409662ce9f9069cc54d18f371f525c1f2e82cb58.tar.gz | |
Introduce the concept of previously mounted media to sysinstall.
This will now allow sysinstall to work properly if a FreeBSD CD/DVD is
already mounted as /cdrom, instead of just crapping out when it tries
to mount as /dist and gets EBUSY.
PR: conf/28081
Tested by: jhb
Diffstat (limited to 'usr.sbin')
| -rw-r--r-- | usr.sbin/sysinstall/cdrom.c | 26 |
1 files changed, 20 insertions, 6 deletions
diff --git a/usr.sbin/sysinstall/cdrom.c b/usr.sbin/sysinstall/cdrom.c index dca26d7..a379373 100644 --- a/usr.sbin/sysinstall/cdrom.c +++ b/usr.sbin/sysinstall/cdrom.c @@ -54,7 +54,8 @@ #undef CD9660 static Boolean cdromMounted; -static char mountpoint[] = "/dist"; +static Boolean previouslyMounted; /* Was the disc already mounted? */ +static char mountpoint[MAXPATHLEN] = "/dist"; static properties read_props(char *name) @@ -90,8 +91,13 @@ mediaInitCDROM(Device *dev) if (errno == EINVAL) { msgConfirm("The disc in your drive looks more like an Audio disc than a FreeBSD release."); return FALSE; - } - else if (errno != EBUSY) { + } else if (errno == EBUSY) { + /* Perhaps the CDROM drive is already mounted as /cdrom */ + if (file_readable("/cdrom/cdrom.inf")) { + previouslyMounted = TRUE; + strlcpy(mountpoint, "/cdrom", 7); + } + } else { msgConfirm("Error mounting %s on %s: %s (%u)", dev->devname, mountpoint, strerror(errno), errno); return FALSE; } @@ -102,7 +108,8 @@ mediaInitCDROM(Device *dev) if (msgYesNo("Warning: The disc currently in the drive is either not a FreeBSD\n" "disc 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 disc anyway?") != 0) { - unmount(mountpoint, MNT_FORCE); + if (!previouslyMounted) + unmount(mountpoint, MNT_FORCE); cdromMounted = FALSE; return FALSE; } @@ -135,7 +142,8 @@ mediaInitCDROM(Device *dev) "installation media.", cp, variable_get(VAR_RELNAME)); if (msgYesNo("Would you like to try and use this disc anyway?") != 0) { - unmount(mountpoint, MNT_FORCE); + if (!previouslyMounted) + unmount(mountpoint, MNT_FORCE); cdromMounted = FALSE; properties_free(cd_attr); return FALSE; @@ -155,7 +163,8 @@ mediaInitCDROM(Device *dev) "Please use the correct installation CD/DVD for your machine type.", cp); - unmount(mountpoint, MNT_FORCE); + if (!previouslyMounted) + unmount(mountpoint, MNT_FORCE); cdromMounted = FALSE; properties_free(cd_attr); return FALSE; @@ -180,6 +189,11 @@ mediaShutdownCDROM(Device *dev) if (!cdromMounted) return; + if (previouslyMounted) { + cdromMounted = FALSE; + return; + } + if (unmount(mountpoint, MNT_FORCE) != 0) msgConfirm("Could not unmount the CDROM/DVD from %s: %s", mountpoint, strerror(errno)); else |
