Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make it possible to invoke newfs_msdos(8) for MS-DOS partitions 

if USE_NEWFS_MSDOS is defined and the specified partition can't be mounted.
This commit is contained in:
tsutsui 2008-02-02 04:15:27 +00:00
parent 112c693a1e
commit 2d251ce390
1 changed files with 21 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
distrib/utils/sysinst/disks.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: disks.c,v 1.97 2008/01/15 12:09:24 hubertf Exp $ */
/* $NetBSD: disks.c,v 1.98 2008/02/02 04:15:27 tsutsui Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@ -358,6 +358,9 @@ make_filesystems(void)
fsname = "lfs";
break;
case FS_MSDOS:
#ifdef USE_NEWFS_MSDOS
asprintf(&newfs, "/sbin/newfs_msdos");
#endif
mnt_opts = "-tmsdos";
fsname = "msdos";
break;
@ -370,6 +373,23 @@ make_filesystems(void)
#endif
}
if (lbl->pi_flags & PIF_NEWFS && newfs != NULL) {
#ifdef USE_NEWFS_MSDOS
if (lbl->pi_fstype == FS_MSDOS) {
/* newfs only if mount fails */
if (run_program(RUN_SILENT | RUN_ERROR_OK,
"mount -rt msdos /dev/%s%c /mnt2",
diskdev, 'a' + ptn) != 0)
error = run_program(
RUN_DISPLAY | RUN_PROGRESS,
"%s /dev/r%s%c",
newfs, diskdev, 'a' + ptn);
else {
run_program(RUN_SILENT | RUN_ERROR_OK,
"umount /mnt2");
error = 0;
}
} else
#endif
error = run_program(RUN_DISPLAY | RUN_PROGRESS,
"%s /dev/r%s%c", newfs, diskdev, 'a' + ptn);
} else {