[src/netbsd-1-6]: src/distrib/utils/sysinst/arch/i386 Pull up revision 1.61 (...

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

details:   https://anonhg.NetBSD.org/src/rev/d2660f2f60b9
branches:  netbsd-1-6
changeset: 528621:d2660f2f60b9
user:      lukem <lukem%NetBSD.org@localhost>
date:      Mon Jul 29 14:46:33 2002 +0000

description:
Pull up revision 1.61 (requested by grant in ticket #553):
add_rc_conf() needs a trailing \n.

diffstat:

 distrib/utils/sysinst/arch/i386/md.c |  16 ++++++++++++----
 1 files changed, 12 insertions(+), 4 deletions(-)

diffs (51 lines):

diff -r 1dac7eac2f2c -r d2660f2f60b9 distrib/utils/sysinst/arch/i386/md.c
--- a/distrib/utils/sysinst/arch/i386/md.c      Mon Jul 29 14:45:46 2002 +0000
+++ b/distrib/utils/sysinst/arch/i386/md.c      Mon Jul 29 14:46:33 2002 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: md.c,v 1.58.2.2 2002/06/14 17:12:51 lukem Exp $ */
+/*     $NetBSD: md.c,v 1.58.2.3 2002/07/29 14:46:33 lukem Exp $ */
 
 /*
  * Copyright 1997 Piermont Information Systems Inc.
@@ -277,6 +277,14 @@
        bsdlabel[F].pi_fstype = FS_UNUSED;
        bsdlabel[G].pi_fstype = FS_UNUSED;
        bsdlabel[H].pi_fstype = FS_UNUSED;
+       bsdlabel[I].pi_fstype = FS_UNUSED;
+       bsdlabel[J].pi_fstype = FS_UNUSED;
+       bsdlabel[K].pi_fstype = FS_UNUSED;
+       bsdlabel[L].pi_fstype = FS_UNUSED;
+       bsdlabel[M].pi_fstype = FS_UNUSED;
+       bsdlabel[N].pi_fstype = FS_UNUSED;
+       bsdlabel[O].pi_fstype = FS_UNUSED;
+       bsdlabel[P].pi_fstype = FS_UNUSED;
 
        switch (layoutkind) {
        case 1: /* standard: a root, b swap, c/d "unused", e /usr */
@@ -369,7 +377,7 @@
        (void)fprintf (f, "\t:nc#%d:nt#%d:ns#%d:\\\n", dlcyl, dlhead, dlsec);
        (void)fprintf (f, "\t:sc#%d:su#%d:\\\n", dlhead*dlsec, dlsize);
        (void)fprintf (f, "\t:se#%d:%s\\\n", sectorsize, doessf);
-       for (i=0; i<8; i++) {
+       for (i=0; i<maxpart; i++) {
                (void)fprintf (f, "\t:p%c#%d:o%c#%d:t%c=%s:",
                               'a'+i, bsdlabel[i].pi_size,
                               'a'+i, bsdlabel[i].pi_offset,
@@ -378,7 +386,7 @@
                        (void)fprintf (f, "b%c#%d:f%c#%d",
                                       'a'+i, bsdlabel[i].pi_bsize,
                                       'a'+i, bsdlabel[i].pi_fsize);
-               if (i < 7)
+               if (i < maxpart -1)
                        (void)fprintf (f, "\\\n");
                else
                        (void)fprintf (f, "\n");
@@ -461,7 +469,7 @@
 
        run_prog(RUN_FATAL, NULL, "mv -f %s %s", realto, realfrom);
        
-       add_rc_conf("wscons=YES");
+       add_rc_conf("wscons=YES\n");
 
        /*
         * For GENERIC_TINY, do not enable any extra screens or wsmux.