Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/usr.sbin/sysinst Remove very strange code that special-cased...



details:   https://anonhg.NetBSD.org/src/rev/4b9e52883ee2
branches:  trunk
changeset: 955809:4b9e52883ee2
user:      martin <martin%NetBSD.org@localhost>
date:      Mon Oct 12 14:29:41 2020 +0000

description:
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.

diffstat:

 usr.sbin/sysinst/disks.c |  19 ++-----------------
 1 files changed, 2 insertions(+), 17 deletions(-)

diffs (34 lines):

diff -r 30afc63e407a -r 4b9e52883ee2 usr.sbin/sysinst/disks.c
--- a/usr.sbin/sysinst/disks.c  Mon Oct 12 14:10:37 2020 +0000
+++ b/usr.sbin/sysinst/disks.c  Mon Oct 12 14:29:41 2020 +0000
@@ -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 @@
                        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 */



Home | Main Index | Thread Index | Old Index