Module Name: src
Committed By: martin
Date: Sun Aug 12 19:02:33 UTC 2012
Modified Files:
src/sys/kern [netbsd-6]: subr_disk_mbr.c
Log Message:
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
To generate a diff of this commit:
cvs rdiff -u -r1.42 -r1.42.8.1 src/sys/kern/subr_disk_mbr.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/kern/subr_disk_mbr.c
diff -u src/sys/kern/subr_disk_mbr.c:1.42 src/sys/kern/subr_disk_mbr.c:1.42.8.1
--- src/sys/kern/subr_disk_mbr.c:1.42 Thu Jun 30 20:09:41 2011
+++ src/sys/kern/subr_disk_mbr.c Sun Aug 12 19:02:33 2012
@@ -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 @@ scan_iso_vrs(mbr_args_t *a)
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 */
