summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--sys/kern/subr_disk.c6
-rw-r--r--sys/sys/disklabel.h4
2 files changed, 7 insertions, 3 deletions
diff --git a/sys/kern/subr_disk.c b/sys/kern/subr_disk.c
index 3262da52107..48c51152d7d 100644
--- a/sys/kern/subr_disk.c
+++ b/sys/kern/subr_disk.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: subr_disk.c,v 1.168 2014/07/13 15:32:28 miod Exp $ */
+/* $OpenBSD: subr_disk.c,v 1.169 2014/08/30 10:44:01 miod Exp $ */
/* $NetBSD: subr_disk.c,v 1.17 1996/03/16 23:17:08 christos Exp $ */
/*
@@ -393,7 +393,8 @@ donot:
struct partition *pp;
u_int8_t fstype;
- if (dp2->dp_typ == DOSPTYP_OPENBSD)
+ if (dp2->dp_typ == DOSPTYP_OPENBSD ||
+ dp2->dp_typ == DOSPTYP_EFI)
continue;
if (letoh32(dp2->dp_size) > DL_GETDSIZE(lp))
continue;
@@ -415,6 +416,7 @@ donot:
fstype = FS_NTFS;
break;
+ case DOSPTYP_EFISYS:
case DOSPTYP_FAT12:
case DOSPTYP_FAT16S:
case DOSPTYP_FAT16B:
diff --git a/sys/sys/disklabel.h b/sys/sys/disklabel.h
index 5b039816e82..30f5fcf8b10 100644
--- a/sys/sys/disklabel.h
+++ b/sys/sys/disklabel.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: disklabel.h,v 1.63 2014/07/13 16:50:25 deraadt Exp $ */
+/* $OpenBSD: disklabel.h,v 1.64 2014/08/30 10:44:02 miod Exp $ */
/* $NetBSD: disklabel.h,v 1.41 1996/05/10 23:07:37 mark Exp $ */
/*
@@ -519,6 +519,8 @@ struct dos_partition {
#define DOSPTYP_FREEBSD 0xa5 /* FreeBSD partition type */
#define DOSPTYP_OPENBSD 0xa6 /* OpenBSD partition type */
#define DOSPTYP_NETBSD 0xa9 /* NetBSD partition type */
+#define DOSPTYP_EFI 0xee /* EFI Protective Partition */
+#define DOSPTYP_EFISYS 0xef /* EFI System Partition */
struct dos_mbr {
u_int8_t dmbr_boot[DOSPARTOFF];