DEVFS - Add probing of OpenBSD slices

diff --git a/sys/kern/subr_disk.c b/sys/kern/subr_disk.c
index 459f5fe..c4fb4f1 100644 (file)
--- a/sys/kern/subr_disk.c
+++ b/sys/kern/subr_disk.c
@@ -233,7 +233,9 @@ disk_probe_slice(struct disk *dp, cdev_t dev, int slice, int reprobe)
                        ops = &disklabel32_ops;
                sp->ds_label = ops->op_clone_label(info, sp);
        } else {
-               if (sp->ds_type == DOSPTYP_386BSD /* XXX */) {
+               if (sp->ds_type == DOSPTYP_386BSD || /* XXX */
+                   sp->ds_type == DOSPTYP_NETBSD ||
+                   sp->ds_type == DOSPTYP_OPENBSD) {
                        log(LOG_WARNING, "%s: cannot find label (%s)\n",
                            dev->si_name, msg);
                }
@@ -328,8 +330,11 @@ disk_probe(struct disk *dp, int reprobe)
                 * XXX slice type 1 used by our gpt probe code.
                 * 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 == DOSPTYP_NBSD) {
+               if (sp->ds_type == DOSPTYP_386BSD ||
+                   sp->ds_type == DOSPTYP_NETBSD ||
+                   sp->ds_type == DOSPTYP_OPENBSD ||
+                   sp->ds_type == 0 ||
+                   sp->ds_type == 1) {
                        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 101cac5..6a5c818 100644 (file)
--- a/sys/sys/diskmbr.h
+++ b/sys/sys/diskmbr.h
@@ -54,7 +54,8 @@
 #define        DOSMAGIC        0xAA55
 
 #define        DOSPTYP_386BSD  0xa5    /* 386BSD partition type */
-#define        DOSPTYP_NBSD    0xa9    /* NetBSD partition type */
+#define        DOSPTYP_OPENBSD 0xa6    /* OpenBSD partition type */
+#define        DOSPTYP_NETBSD  0xa9    /* NetBSD partition type */
 #define        DOSPTYP_LINSWP  0x82    /* Linux swap partition */
 #define        DOSPTYP_LINUX   0x83    /* Linux partition */
 #define        DOSPTYP_PMBR    0xee    /* GPT Protective MBR */