[src/netbsd-6]: src/sys/kern Pull up following revision(s) (requested by tsut...

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

details:   https://anonhg.NetBSD.org/src/rev/3956b5c9a538
branches:  netbsd-6
changeset: 774423:3956b5c9a538
user:      martin <martin%NetBSD.org@localhost>
date:      Sun Aug 12 19:02:33 2012 +0000

description:
Pull up following revision(s) (requested by tsutsui in ticket #482):
        sys/kern/subr_disk_mbr.c: revision 1.43
Apply workaround for installcd mountroot failure on some i386 machines

diffstat:

 sys/kern/subr_disk_mbr.c |  6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diffs (30 lines):

diff -r 588859687feb -r 3956b5c9a538 sys/kern/subr_disk_mbr.c
--- a/sys/kern/subr_disk_mbr.c  Sun Aug 12 18:58:28 2012 +0000
+++ b/sys/kern/subr_disk_mbr.c  Sun Aug 12 19:02:33 2012 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: subr_disk_mbr.c,v 1.42 2011/06/30 20:09:41 wiz Exp $   */
+/*     $NetBSD: subr_disk_mbr.c,v 1.42.8.1 2012/08/12 19:02:33 martin Exp $    */
 
 /*
  * Copyright (c) 1982, 1986, 1988 Regents of the University of California.
@@ -54,7 +54,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: subr_disk_mbr.c,v 1.42 2011/06/30 20:09:41 wiz Exp $");
+__KERNEL_RCSID(0, "$NetBSD: subr_disk_mbr.c,v 1.42.8.1 2012/08/12 19:02:33 martin Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -364,9 +364,11 @@
                a->lp->d_partitions[0].p_size   = a->lp->d_secperunit;
                a->lp->d_partitions[0].p_cdsession = is_iso9660;
                a->lp->d_partitions[0].p_fstype = FS_ISO9660;
+#ifdef notyet
        } else {
                a->lp->d_partitions[0].p_size   = 0;
                a->lp->d_partitions[0].p_fstype = FS_UNUSED;
+#endif
        }
 
        /* add udf partition if found */