[src/netbsd-2]: src/distrib/utils/sysinst Pull up following revision(s) (requ...

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

details:   https://anonhg.NetBSD.org/src/rev/93671077dbef
branches:  netbsd-2
changeset: 564059:93671077dbef
user:      riz <riz%NetBSD.org@localhost>
date:      Tue Sep 13 22:32:44 2005 +0000

description:
Pull up following revision(s) (requested by dsl in ticket #5838):
        distrib/utils/sysinst/disks.c: revision 1.89
Comment out the vstab entries generated for alternate root filesystems.
Marking the 'noauto' isn't enough to stop the code that remounts root rw
trying to use them.

diffstat:

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

diffs (20 lines):

diff -r ec303cd76187 -r 93671077dbef distrib/utils/sysinst/disks.c
--- a/distrib/utils/sysinst/disks.c     Tue Sep 13 22:28:51 2005 +0000
+++ b/distrib/utils/sysinst/disks.c     Tue Sep 13 22:32:44 2005 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: disks.c,v 1.76.2.4.2.1 2005/07/24 02:25:24 snj Exp $ */
+/*     $NetBSD: disks.c,v 1.76.2.4.2.2 2005/09/13 22:32:44 riz Exp $ */
 
 /*
  * Copyright 1997 Piermont Information Systems Inc.
@@ -448,6 +448,10 @@
                        s = "# ";
                        break;
                }
+               /* The code that remounts root rw doesn't check the partition */
+               if (strcmp(mp, "/") == 0 && !(bsdlabel[i].pi_flags & PIF_MOUNT))
+                       s = "# ";
+
                scripting_fprintf(f, "%s/dev/%s%c %s %s rw%s%s%s%s%s%s%s%s %d %d\n",
                   s, diskdev, 'a' + i, mp, fstype,
                   bsdlabel[i].pi_flags & PIF_MOUNT ? "" : ",noauto",