summaryrefslogtreecommitdiff
path: root/sys/arch/alpha
diff options
context:
space:
mode:
Diffstat (limited to 'sys/arch/alpha')
-rw-r--r--sys/arch/alpha/alpha/disksubr.c9
-rw-r--r--sys/arch/alpha/include/disklabel.h6
2 files changed, 10 insertions, 5 deletions
diff --git a/sys/arch/alpha/alpha/disksubr.c b/sys/arch/alpha/alpha/disksubr.c
index 15dc951cb30..16d2dc3d617 100644
--- a/sys/arch/alpha/alpha/disksubr.c
+++ b/sys/arch/alpha/alpha/disksubr.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: disksubr.c,v 1.17 1998/01/11 20:42:03 provos Exp $ */
+/* $OpenBSD: disksubr.c,v 1.18 1998/02/19 20:36:39 deraadt Exp $ */
/* $NetBSD: disksubr.c,v 1.21 1996/05/03 19:42:03 christos Exp $ */
/*
@@ -374,7 +374,12 @@ readdoslabel(bp, strat, lp, osdep, partoffp, cylp)
for (dp2=dp, i=0;
i < NDOSPART && ourpart == -1; i++, dp2++)
if (dp2->dp_size &&
- dp2->dp_typ == DOSPTYP_386BSD)
+ dp2->dp_typ == DOSPTYP_FREEBSD)
+ ourpart = i;
+ for (dp2=dp, i=0;
+ i < NDOSPART && ourpart == -1; i++, dp2++)
+ if (dp2->dp_size &&
+ dp2->dp_typ == DOSPTYP_NETBSD)
ourpart = i;
if (ourpart == -1)
goto donot;
diff --git a/sys/arch/alpha/include/disklabel.h b/sys/arch/alpha/include/disklabel.h
index fc1a492db42..34f59e5047d 100644
--- a/sys/arch/alpha/include/disklabel.h
+++ b/sys/arch/alpha/include/disklabel.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: disklabel.h,v 1.8 1998/01/11 20:41:57 provos Exp $ */
+/* $OpenBSD: disklabel.h,v 1.9 1998/02/19 20:36:28 deraadt Exp $ */
/* $NetBSD: disklabel.h,v 1.1 1995/02/13 23:07:34 cgd Exp $ */
/*
@@ -86,9 +86,9 @@ struct dos_partition {
#define DOSPTYP_FAT16C 0x0e /* 16-bit FAT, CHS-mapped */
#define DOSPTYP_ONTRACK 0x54
#define DOSPTYP_LINUX 0x83 /* That other thing */
-#define DOSPTYP_386BSD 0xa5 /* 386BSD partition type */
-#define DOSPTYP_NETBSD DOSPTYP_386BSD /* NetBSD partition type (XXX) */
+#define DOSPTYP_FREEBSD 0xa5 /* FreeBSD partition type */
#define DOSPTYP_OPENBSD 0xa6 /* OpenBSD partition type */
+#define DOSPTYP_NETBSD 0xa9 /* NetBSD partition type */
/* Isolate the relevant bits to get sector and cylinder. */
#define DPSECT(s) ((s) & 0x3f)