[src/netbsd-1-5]: src/distrib/utils/sysinst Pullup 1.37 [fvdl]:

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

details:   https://anonhg.NetBSD.org/src/rev/634ab15dd6e0
branches:  netbsd-1-5
changeset: 490233:634ab15dd6e0
user:      tv <tv%NetBSD.org@localhost>
date:      Tue Nov 14 16:13:07 2000 +0000

description:
Pullup 1.37 [fvdl]:
For filesystem checks, skip any 'noauto' entries. Avoids problems
when upgrading a system that has a 'noauto' entry for a floppy
or CD device that has type ffs.

diffstat:

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

diffs (30 lines):

diff -r e6b61cfb1d6a -r 634ab15dd6e0 distrib/utils/sysinst/disks.c
--- a/distrib/utils/sysinst/disks.c     Tue Nov 14 16:10:24 2000 +0000
+++ b/distrib/utils/sysinst/disks.c     Tue Nov 14 16:13:07 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: disks.c,v 1.31.4.2 2000/11/01 02:51:23 tv Exp $ */
+/*     $NetBSD: disks.c,v 1.31.4.3 2000/11/14 16:13:07 tv Exp $ */
 
 /*
  * Copyright 1997 Piermont Information Systems Inc.
@@ -356,8 +356,8 @@
 
 
 static struct lookfor fstabbuf[] = {
-       {"/dev/", "/dev/%s %s ffs", "c", NULL, 0, 0, foundffs},
-       {"/dev/", "/dev/%s %s ufs", "c", NULL, 0, 0, foundffs},
+       {"/dev/", "/dev/%s %s ffs %s", "c", NULL, 0, 0, foundffs},
+       {"/dev/", "/dev/%s %s ufs %s", "c", NULL, 0, 0, foundffs},
 };
 static int numfstabbuf = sizeof(fstabbuf) / sizeof(struct lookfor);
 
@@ -370,7 +370,8 @@
 static void
 foundffs(struct data *list, int num)
 {
-       if (strcmp(list[1].u.s_val, "/") != 0) {
+       if (strcmp(list[1].u.s_val, "/") != 0 &&
+           strstr(list[2].u.s_val, "noauto") == NULL) {
                strncpy(dev[devcnt], list[0].u.s_val, SSTRSIZE);
                strncpy(mnt[devcnt], list[1].u.s_val, STRSIZE);
                devcnt++;