[src/trunk]: src/distrib/utils/sysinst Back out last; inadvertantly committed...

[scottr <scottr%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/81ac60f83972
branches:  trunk
changeset: 533415:81ac60f83972
user:      scottr <scottr%NetBSD.org@localhost>
date:      Sat Jun 29 20:16:41 2002 +0000

description:
Back out last; inadvertantly committed. This will be resurrected
in the future, in all likelihood, but it wasn't ready yet.

diffstat:

 distrib/utils/sysinst/disks.c |  26 +++++++++-----------------
 1 files changed, 9 insertions(+), 17 deletions(-)

diffs (57 lines):

diff -r e6a4f6af9d6e -r 81ac60f83972 distrib/utils/sysinst/disks.c
--- a/distrib/utils/sysinst/disks.c     Sat Jun 29 20:12:57 2002 +0000
+++ b/distrib/utils/sysinst/disks.c     Sat Jun 29 20:16:41 2002 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: disks.c,v 1.42 2002/06/29 20:12:57 scottr Exp $ */
+/*     $NetBSD: disks.c,v 1.43 2002/06/29 20:16:41 scottr Exp $ */
 
 /*
  * Copyright 1997 Piermont Information Systems Inc.
@@ -319,31 +319,23 @@
 #endif         
        }
        for (i = 0; i < getmaxpartitions(); i++)
-               if (bsdlabel[i].pi_fstype == FS_BSDFFS) {
-                       char *s = "#";
-
-                       if (*fsmount[i] != '\0')
-                               s++;
-                       scripting_fprintf(f, "%s/dev/%s%c %s ffs rw 1 %d\n", s,
+               if (bsdlabel[i].pi_fstype == FS_BSDFFS)
+                       scripting_fprintf(f, "/dev/%s%c %s ffs rw 1 %d\n",
                                       diskdev, 'a'+i, fsmount[i],
                                       fsck_num(fsmount[i]));
-               } else if (bsdlabel[i].pi_fstype == FS_BSDLFS) {
+               else if (bsdlabel[i].pi_fstype == FS_BSDLFS) {
                        char *s = "#";
 
                        /* If there is no LFS, just comment it out. */
-                       if (!check_lfs_progs() && *fsmount[i] != '\0')
+                       if (!check_lfs_progs())
                                s++;
                        scripting_fprintf(f, "%s/dev/%s%c %s lfs rw 1 %d\n", s,
                                       diskdev, 'a'+i, fsmount[i],
                                       fsck_num(fsmount[i]));
-               } else if (bsdlabel[i].pi_fstype == FS_MSDOS) {
-                       char *s = "#";
-
-                       if (*fsmount[i] != '\0')
-                               s++;
-                       scripting_fprintf(f, "%s/dev/%s%c %s msdos rw 0 0\n", s,
+               } else if (bsdlabel[i].pi_fstype == FS_MSDOS)
+                       scripting_fprintf(f, "/dev/%s%c %s msdos rw 0 0\n",
                                       diskdev, 'a'+i, fsmount[i]);
-               } else if (bsdlabel[i].pi_fstype == FS_SWAP) {
+               else if (bsdlabel[i].pi_fstype == FS_SWAP) {
                        if (swapdev == -1)
                                swapdev = i;
                        scripting_fprintf(f, "/dev/%s%c none swap sw 0 0\n", diskdev, 'a'+i);
@@ -371,7 +363,7 @@
 {
        static int num = 1;
 
-       if (strcmp(mp, "/") == 0)
+       if (strcmp(mp, "/"))
                return 1;
 
        return (++num);