Module Name: src
Committed By: martin
Date: Mon Oct 12 14:29:41 UTC 2020
Modified Files:
src/usr.sbin/sysinst: disks.c
Log Message:
Remove very strange code that special-cased MSDOS file systems and refused
to newfs the partition (despite explicit request to do so) if it was
mountable.
Accidently carried over from a dim and distant past, before we had
fsck_newfs.
To generate a diff of this commit:
cvs rdiff -u -r1.69 -r1.70 src/usr.sbin/sysinst/disks.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.sbin/sysinst/disks.c
diff -u src/usr.sbin/sysinst/disks.c:1.69 src/usr.sbin/sysinst/disks.c:1.70
--- src/usr.sbin/sysinst/disks.c:1.69 Mon Sep 28 18:51:34 2020
+++ src/usr.sbin/sysinst/disks.c Mon Oct 12 14:29:41 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: disks.c,v 1.69 2020/09/28 18:51:34 martin Exp $ */
+/* $NetBSD: disks.c,v 1.70 2020/10/12 14:29:41 martin Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -1188,23 +1188,8 @@ make_filesystems(struct install_partitio
break;
}
if ((ptn->instflags & PUIINST_NEWFS) && newfs != NULL) {
- if (ptn->fs_type == FS_MSDOS) {
- /* newfs only if mount fails */
- if (run_program(RUN_SILENT | RUN_ERROR_OK,
- "mount -rt msdos %s /mnt2", devdev) != 0)
- error = run_program(
- RUN_DISPLAY | RUN_PROGRESS,
- "%s %s",
- newfs, rdev);
- else {
- run_program(RUN_SILENT | RUN_ERROR_OK,
- "umount /mnt2");
- error = 0;
- }
- } else {
- error = run_program(RUN_DISPLAY | RUN_PROGRESS,
+ error = run_program(RUN_DISPLAY | RUN_PROGRESS,
"%s %s", newfs, rdev);
- }
} else if ((ptn->instflags & (PUIINST_MOUNT|PUIINST_BOOT))
&& fsname != NULL) {
/* We'd better check it isn't dirty */
