summaryrefslogtreecommitdiff
path: root/sys/arch
diff options
context:
space:
mode:
Diffstat (limited to 'sys/arch')
-rw-r--r--sys/arch/alpha/alpha/disksubr.c9
-rw-r--r--sys/arch/alpha/include/disklabel.h6
-rw-r--r--sys/arch/arc/include/disklabel.h6
-rw-r--r--sys/arch/i386/i386/disksubr.c14
-rw-r--r--sys/arch/i386/include/disklabel.h6
-rw-r--r--sys/arch/mips/include/disklabel.h6
-rw-r--r--sys/arch/mips/mips/disksubr.c14
-rw-r--r--sys/arch/powerpc/include/disklabel.h6
-rw-r--r--sys/arch/powerpc/powerpc/disksubr.c14
-rw-r--r--sys/arch/wgrisc/include/disklabel.h6
-rw-r--r--sys/arch/wgrisc/wgrisc/disksubr.c14
11 files changed, 69 insertions, 32 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)
diff --git a/sys/arch/arc/include/disklabel.h b/sys/arch/arc/include/disklabel.h
index 4a975bda8f3..5c902f6a889 100644
--- a/sys/arch/arc/include/disklabel.h
+++ b/sys/arch/arc/include/disklabel.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: disklabel.h,v 1.11 1998/01/11 20:41:59 provos Exp $ */
+/* $OpenBSD: disklabel.h,v 1.12 1998/02/19 20:36:30 deraadt Exp $ */
/* $NetBSD: disklabel.h,v 1.3 1996/03/09 20:52:54 ghudson Exp $ */
/*
@@ -69,9 +69,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 */
#include <sys/dkbad.h>
struct cpu_disklabel {
diff --git a/sys/arch/i386/i386/disksubr.c b/sys/arch/i386/i386/disksubr.c
index fde6ce763dd..de3e3d7d5fb 100644
--- a/sys/arch/i386/i386/disksubr.c
+++ b/sys/arch/i386/i386/disksubr.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: disksubr.c,v 1.30 1998/01/11 20:42:06 provos Exp $ */
+/* $OpenBSD: disksubr.c,v 1.31 1998/02/19 20:36:40 deraadt Exp $ */
/* $NetBSD: disksubr.c,v 1.21 1996/05/03 19:42:03 christos Exp $ */
/*
@@ -145,7 +145,12 @@ readdisklabel(dev, strat, lp, osdep)
for (dp2=dp, i=0; i < NDOSPART && ourpart == -1;
i++, dp2++)
if (get_le(&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 (get_le(&dp2->dp_size) &&
+ dp2->dp_typ == DOSPTYP_NETBSD)
ourpart = i;
if (ourpart == -1)
goto donot;
@@ -413,7 +418,10 @@ writedisklabel(dev, strat, lp, osdep)
if (get_le(&dp2->dp_size) && dp2->dp_typ == DOSPTYP_OPENBSD)
ourpart = i;
for (dp2=dp, i=0; i < NDOSPART && ourpart == -1; i++, dp2++)
- if (get_le(&dp2->dp_size) && dp2->dp_typ == DOSPTYP_386BSD)
+ if (get_le(&dp2->dp_size) && dp2->dp_typ == DOSPTYP_FREEBSD)
+ ourpart = i;
+ for (dp2=dp, i=0; i < NDOSPART && ourpart == -1; i++, dp2++)
+ if (get_le(&dp2->dp_size) && dp2->dp_typ == DOSPTYP_NETBSD)
ourpart = i;
if (ourpart != -1) {
diff --git a/sys/arch/i386/include/disklabel.h b/sys/arch/i386/include/disklabel.h
index 1180aca11e5..e929785d36f 100644
--- a/sys/arch/i386/include/disklabel.h
+++ b/sys/arch/i386/include/disklabel.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: disklabel.h,v 1.17 1998/01/11 20:42:00 provos Exp $ */
+/* $OpenBSD: disklabel.h,v 1.18 1998/02/19 20:36:31 deraadt Exp $ */
/* $NetBSD: disklabel.h,v 1.3 1996/03/09 20:52:54 ghudson Exp $ */
/*
@@ -68,9 +68,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 */
struct dos_mbr {
u_int8_t dmbr_boot[DOSPARTOFF];
diff --git a/sys/arch/mips/include/disklabel.h b/sys/arch/mips/include/disklabel.h
index 7de65cec7eb..5a94cf9a4d1 100644
--- a/sys/arch/mips/include/disklabel.h
+++ b/sys/arch/mips/include/disklabel.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: disklabel.h,v 1.1 1998/01/28 11:14:39 pefo Exp $ */
+/* $OpenBSD: disklabel.h,v 1.2 1998/02/19 20:36:34 deraadt Exp $ */
/* $NetBSD: disklabel.h,v 1.3 1996/03/09 20:52:54 ghudson Exp $ */
/*
@@ -66,9 +66,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 */
#include <sys/dkbad.h>
struct cpu_disklabel {
diff --git a/sys/arch/mips/mips/disksubr.c b/sys/arch/mips/mips/disksubr.c
index 0ad138cd7ab..5f25eec0375 100644
--- a/sys/arch/mips/mips/disksubr.c
+++ b/sys/arch/mips/mips/disksubr.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: disksubr.c,v 1.1 1998/01/28 12:12:07 pefo Exp $ */
+x1/* $OpenBSD: disksubr.c,v 1.2 1998/02/19 20:36:41 deraadt Exp $ */
/* $NetBSD: disksubr.c,v 1.21 1996/05/03 19:42:03 christos Exp $ */
/*
@@ -148,7 +148,12 @@ readdisklabel(dev, strat, lp, osdep)
for (dp2=dp, i=0; i < NDOSPART && ourpart == -1;
i++, dp2++)
if (get_le(&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 (get_le(&dp2->dp_size) &&
+ dp2->dp_typ == DOSPTYP_NETBSD)
ourpart = i;
if (ourpart == -1)
goto donot;
@@ -416,7 +421,10 @@ writedisklabel(dev, strat, lp, osdep)
if (get_le(&dp2->dp_size) && dp2->dp_typ == DOSPTYP_OPENBSD)
ourpart = i;
for (dp2=dp, i=0; i < NDOSPART && ourpart == -1; i++, dp2++)
- if (get_le(&dp2->dp_size) && dp2->dp_typ == DOSPTYP_386BSD)
+ if (get_le(&dp2->dp_size) && dp2->dp_typ == DOSPTYP_FREEBSD)
+ ourpart = i;
+ for (dp2=dp, i=0; i < NDOSPART && ourpart == -1; i++, dp2++)
+ if (get_le(&dp2->dp_size) && dp2->dp_typ == DOSPTYP_NETBSD)
ourpart = i;
if (ourpart != -1) {
diff --git a/sys/arch/powerpc/include/disklabel.h b/sys/arch/powerpc/include/disklabel.h
index 198a9787ec8..1b21247791a 100644
--- a/sys/arch/powerpc/include/disklabel.h
+++ b/sys/arch/powerpc/include/disklabel.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: disklabel.h,v 1.9 1998/01/11 20:42:01 provos Exp $ */
+/* $OpenBSD: disklabel.h,v 1.10 1998/02/19 20:36:35 deraadt Exp $ */
/*
* Copyright (c) 1994 Christopher G. Demetriou
@@ -71,9 +71,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 */
#include <sys/dkbad.h>
struct cpu_disklabel {
diff --git a/sys/arch/powerpc/powerpc/disksubr.c b/sys/arch/powerpc/powerpc/disksubr.c
index e98e20c4c7d..d3a70f7f68b 100644
--- a/sys/arch/powerpc/powerpc/disksubr.c
+++ b/sys/arch/powerpc/powerpc/disksubr.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: disksubr.c,v 1.8 1998/01/11 20:42:07 provos Exp $ */
+x1/* $OpenBSD: disksubr.c,v 1.9 1998/02/19 20:36:43 deraadt Exp $ */
/* $NetBSD: disksubr.c,v 1.21 1996/05/03 19:42:03 christos Exp $ */
/*
@@ -148,7 +148,12 @@ readdisklabel(dev, strat, lp, osdep)
for (dp2=dp, i=0; i < NDOSPART && ourpart == -1;
i++, dp2++)
if (get_le(&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 (get_le(&dp2->dp_size) &&
+ dp2->dp_typ == DOSPTYP_NETBSD)
ourpart = i;
if (ourpart == -1)
goto donot;
@@ -416,7 +421,10 @@ writedisklabel(dev, strat, lp, osdep)
if (get_le(&dp2->dp_size) && dp2->dp_typ == DOSPTYP_OPENBSD)
ourpart = i;
for (dp2=dp, i=0; i < NDOSPART && ourpart == -1; i++, dp2++)
- if (get_le(&dp2->dp_size) && dp2->dp_typ == DOSPTYP_386BSD)
+ if (get_le(&dp2->dp_size) && dp2->dp_typ == DOSPTYP_FREEBSD)
+ ourpart = i;
+ for (dp2=dp, i=0; i < NDOSPART && ourpart == -1; i++, dp2++)
+ if (get_le(&dp2->dp_size) && dp2->dp_typ == DOSPTYP_NETBSD)
ourpart = i;
if (ourpart != -1) {
diff --git a/sys/arch/wgrisc/include/disklabel.h b/sys/arch/wgrisc/include/disklabel.h
index c4a4c4197a0..08624f00d05 100644
--- a/sys/arch/wgrisc/include/disklabel.h
+++ b/sys/arch/wgrisc/include/disklabel.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: disklabel.h,v 1.5 1998/01/11 20:42:02 provos Exp $ */
+/* $OpenBSD: disklabel.h,v 1.6 1998/02/19 20:36:37 deraadt Exp $ */
/* $NetBSD: disklabel.h,v 1.3 1996/03/09 20:52:54 ghudson Exp $ */
/*
@@ -67,9 +67,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 */
#include <sys/dkbad.h>
struct cpu_disklabel {
diff --git a/sys/arch/wgrisc/wgrisc/disksubr.c b/sys/arch/wgrisc/wgrisc/disksubr.c
index 1355b845710..5e70dcb6175 100644
--- a/sys/arch/wgrisc/wgrisc/disksubr.c
+++ b/sys/arch/wgrisc/wgrisc/disksubr.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: disksubr.c,v 1.7 1998/01/11 20:42:09 provos Exp $ */
+/* $OpenBSD: disksubr.c,v 1.8 1998/02/19 20:36:44 deraadt Exp $ */
/* $NetBSD: disksubr.c,v 1.21 1996/05/03 19:42:03 christos Exp $ */
/*
@@ -148,7 +148,12 @@ readdisklabel(dev, strat, lp, osdep)
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;
@@ -412,7 +417,10 @@ writedisklabel(dev, strat, lp, osdep)
if (dp2->dp_size && dp2->dp_typ == DOSPTYP_OPENBSD)
ourpart = i;
for (dp2=dp, i=0; i < NDOSPART && ourpart == -1; i++, dp2++)
- if (dp2->dp_size && dp2->dp_typ == DOSPTYP_386BSD)
+ if (dp2->dp_size && 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) {
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-27 07:21:42 +0000