From 9daebf8f49d5b7e5a80639c299cd1085bcf044fa Mon Sep 17 00:00:00 2001 From: Alex Hornung Date: Sun, 20 Sep 2009 20:59:48 +0100 Subject: [PATCH] disk - Also probe NetBSD slices for labels * Also probe NetBSD slice types (169 / 0xa9) for disklabels, as we also support them. Reported-by: trevorjk --- sys/kern/subr_disk.c | 2 +- sys/sys/diskmbr.h | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/sys/kern/subr_disk.c b/sys/kern/subr_disk.c index c84d57bff9..40ae1b5ef4 100644 --- a/sys/kern/subr_disk.c +++ b/sys/kern/subr_disk.c @@ -329,7 +329,7 @@ disk_probe(struct disk *dp, int reprobe) * XXX slice type 0 used by mbr compat slice. */ if (sp->ds_type == DOSPTYP_386BSD || sp->ds_type == 0 || - sp->ds_type == 1) { + sp->ds_type == 1 || sp->ds_type == DOSPTYP_NBSD) { if (dp->d_slice->dss_first_bsd_slice == 0) dp->d_slice->dss_first_bsd_slice = i; disk_probe_slice(dp, ndev, i, reprobe); diff --git a/sys/sys/diskmbr.h b/sys/sys/diskmbr.h index 7f1205f542..101cac54ff 100644 --- a/sys/sys/diskmbr.h +++ b/sys/sys/diskmbr.h @@ -54,6 +54,7 @@ #define DOSMAGIC 0xAA55 #define DOSPTYP_386BSD 0xa5 /* 386BSD partition type */ +#define DOSPTYP_NBSD 0xa9 /* NetBSD partition type */ #define DOSPTYP_LINSWP 0x82 /* Linux swap partition */ #define DOSPTYP_LINUX 0x83 /* Linux partition */ #define DOSPTYP_PMBR 0xee /* GPT Protective MBR */ -- 2.11.4.GIT