Module Name: src
Committed By: christos
Date: Fri Jul 13 16:15:49 UTC 2012
Modified Files:
src/sys/kern: subr_disk_mbr.c
Log Message:
revert previous; the problem was off by one in the bios device comparison
in x86_autoconf.c
To generate a diff of this commit:
cvs rdiff -u -r1.43 -r1.44 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.43 src/sys/kern/subr_disk_mbr.c:1.44
--- src/sys/kern/subr_disk_mbr.c:1.43 Tue Jul 3 09:03:47 2012
+++ src/sys/kern/subr_disk_mbr.c Fri Jul 13 12:15:48 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: subr_disk_mbr.c,v 1.43 2012/07/03 13:03:47 christos Exp $ */
+/* $NetBSD: subr_disk_mbr.c,v 1.44 2012/07/13 16:15:48 christos 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.43 2012/07/03 13:03:47 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: subr_disk_mbr.c,v 1.44 2012/07/13 16:15:48 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -364,11 +364,9 @@ 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 */