Index: sys/boot/i386/boot2/boot1.s =================================================================== RCS file: /usr/local/cvsroot/src/sys/boot/i386/boot2/boot1.s,v retrieving revision 1.10.2.2 diff -c -r1.10.2.2 boot1.s *** sys/boot/i386/boot2/boot1.s 2000/07/07 21:12:32 1.10.2.2 --- sys/boot/i386/boot2/boot1.s 2000/12/04 22:11:21 *************** *** 29,34 **** --- 29,35 ---- .set PRT_OFF,0x1be # Partition offset .set PRT_NUM,0x4 # Partitions .set PRT_BSD,0xa5 # Partition type + .set PRT_OPENBSD,0xa6 # Partition type # Flag Bits .set FL_PACKET,0x80 # Packet mode *************** *** 112,118 **** mov $0x1,%cx # Two passes main.1: mov $MEM_BUF+PRT_OFF,%si # Partition table movb $0x1,%dh # Partition ! main.2: cmpb $PRT_BSD,0x4(%si) # Our partition type? jne main.3 # No jcxz main.5 # If second pass testb $0x80,(%si) # Active? --- 113,119 ---- mov $0x1,%cx # Two passes main.1: mov $MEM_BUF+PRT_OFF,%si # Partition table movb $0x1,%dh # Partition ! main.2: cmpb $PRT_OPENBSD,0x4(%si) # Our partition type? jne main.3 # No jcxz main.5 # If second pass testb $0x80,(%si) # Active? Index: sys/boot/i386/boot2/boot2.c =================================================================== RCS file: /usr/local/cvsroot/src/sys/boot/i386/boot2/boot2.c,v retrieving revision 1.28.2.2 diff -c -r1.28.2.2 boot2.c *** sys/boot/i386/boot2/boot2.c 2000/07/07 21:12:32 1.28.2.2 --- sys/boot/i386/boot2/boot2.c 2000/12/04 22:28:06 *************** *** 619,625 **** if (sl != WHOLE_DISK_SLICE) { if (sl != COMPATIBILITY_SLICE) dp += sl - BASE_SLICE; ! if (dp->dp_typ != DOSPTYP_386BSD) { printf("Invalid %s\n", "slice"); return -1; } --- 619,626 ---- if (sl != WHOLE_DISK_SLICE) { if (sl != COMPATIBILITY_SLICE) dp += sl - BASE_SLICE; ! if ((dp->dp_typ != DOSPTYP_386BSD) && ! (dp->dp_typ != DOSPTYP_OPENBSD)) { printf("Invalid %s\n", "slice"); return -1; } Index: sys/sys/disklabel.h =================================================================== RCS file: /usr/local/cvsroot/src/sys/sys/disklabel.h,v retrieving revision 1.49.2.5 diff -c -r1.49.2.5 disklabel.h *** sys/sys/disklabel.h 2000/11/26 03:08:50 1.49.2.5 --- sys/sys/disklabel.h 2000/12/10 02:31:51 *************** *** 360,365 **** --- 360,366 ---- #define DOSPARTOFF 446 #define NDOSPART 4 #define DOSPTYP_386BSD 0xa5 /* 386BSD partition type */ + #define DOSPTYP_OPENBSD 0xa6 /* OpenBSD partition type */ #define DOSPTYP_LINSWP 0x82 /* Linux swap partition */ #define DOSPTYP_LINUX 0x83 /* Linux partition */ #define DOSPTYP_EXT 5 /* DOS extended partition */