diff options
author | Jordan K. Hubbard <jkh@FreeBSD.org> | 1995-05-25 01:22:20 +0000 |
---|---|---|
committer | Jordan K. Hubbard <jkh@FreeBSD.org> | 1995-05-25 01:22:20 +0000 |
commit | 903463ef42563351d2179ff01b733f725e60e50d (patch) | |
tree | c5a7d232f1df6fc09acb26c1d560600b61f0b6d1 /release/sysinstall/misc.c | |
parent | 34753e5aeee845370ba7c043681dddbe28e48376 (diff) | |
download | src-903463ef42563351d2179ff01b733f725e60e50d.tar.gz src-903463ef42563351d2179ff01b733f725e60e50d.zip |
Put back some changes that were smashed in yesterday's release tree
shoot-down.
Notes
Notes:
svn path=/head/; revision=8739
Diffstat (limited to 'release/sysinstall/misc.c')
-rw-r--r-- | release/sysinstall/misc.c | 35 |
1 files changed, 32 insertions, 3 deletions
diff --git a/release/sysinstall/misc.c b/release/sysinstall/misc.c index 197a9ec774d4..a2ab20f8aed6 100644 --- a/release/sysinstall/misc.c +++ b/release/sysinstall/misc.c @@ -1,7 +1,7 @@ /* * Miscellaneous support routines.. * - * $Id: misc.c,v 1.7 1995/05/18 16:57:52 jkh Exp $ + * $Id: misc.c,v 1.8 1995/05/23 18:06:15 jkh Exp $ * * Copyright (c) 1995 * Jordan Hubbard. All rights reserved. @@ -234,8 +234,37 @@ Mount(char *mountp, void *dev) msgDebug("mount %s %s\n", device, mountpoint); ufsargs.fspec = device; if (mount(MOUNT_UFS, mountpoint, 0, (caddr_t)&ufsargs) == -1) { - msgConfirm("Error mounting %s on %s : %s\n", - device, mountpoint, strerror(errno)); + msgConfirm("Error mounting %s on %s : %s\n", device, mountpoint, strerror(errno)); + return 1; + } + return 0; +} + +int +Mount_DOS(char *mountp, void *dev) +{ + struct ufs_args ufsargs; + char device[80]; + char mountpoint[FILENAME_MAX]; + + if (*((char *)dev) != '/') { + sprintf(device, "/mnt/dev/%s", (char *)dev); + sprintf(mountpoint, "/mnt%s", mountp); + } + else { + strcpy(device, dev); + strcpy(mountpoint, mountp); + } + memset(&ufsargs,0,sizeof ufsargs); + + if (Mkdir(mountpoint, NULL)) { + msgConfirm("Unable to make directory mountpoint for %s!", mountpoint); + return 1; + } + msgDebug("mount %s %s\n", device, mountpoint); + ufsargs.fspec = device; + if (mount(MOUNT_MSDOS, mountpoint, 0, (caddr_t)&ufsargs) == -1) { + msgConfirm("Error mounting %s on %s : %s\n", device, mountpoint, strerror(errno)); return 1; } return 0; |