From fc10c1d1d4e52229683879bf5775e8bc24058620 Mon Sep 17 00:00:00 2001 From: Miod Vallat Date: Thu, 18 Apr 2002 22:12:39 +0000 Subject: Make the Mac68k disklabel 16 partitions long, to cope with partition-{convoluted,challenged} disks. --- sys/arch/mac68k/conf/files.mac68k | 4 ++-- sys/arch/mac68k/include/disklabel.h | 13 ++++++++++--- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/sys/arch/mac68k/conf/files.mac68k b/sys/arch/mac68k/conf/files.mac68k index 4447b5bf740..8a3e34db884 100644 --- a/sys/arch/mac68k/conf/files.mac68k +++ b/sys/arch/mac68k/conf/files.mac68k @@ -1,10 +1,10 @@ -# $OpenBSD: files.mac68k,v 1.28 2002/04/16 15:32:55 miod Exp $ +# $OpenBSD: files.mac68k,v 1.29 2002/04/18 22:12:37 miod Exp $ # $NetBSD: files.mac68k,v 1.61 1997/03/01 20:22:16 scottr Exp $ # mac68k-specific configuration info # maxpartitions must be first item in files.${ARCH}.newconf -maxpartitions 8 +maxpartitions 16 maxusers 2 8 64 diff --git a/sys/arch/mac68k/include/disklabel.h b/sys/arch/mac68k/include/disklabel.h index 956a5af63d7..28820db1a61 100644 --- a/sys/arch/mac68k/include/disklabel.h +++ b/sys/arch/mac68k/include/disklabel.h @@ -1,4 +1,4 @@ -/* $OpenBSD: disklabel.h,v 1.5 2001/12/06 23:47:28 miod Exp $ */ +/* $OpenBSD: disklabel.h,v 1.6 2002/04/18 22:12:38 miod Exp $ */ /* $NetBSD: disklabel.h,v 1.2 1996/05/05 06:17:38 briggs Exp $ */ /* @@ -35,10 +35,17 @@ #define _MAC68K_DISKLABEL_H_ #define LABELSECTOR 0 /* sector containing label */ -#define LABELOFFSET 64 /* offset of label in sector */ -#define MAXPARTITIONS 8 /* number of partitions */ +#define MAXPARTITIONS 16 /* number of partitions */ #define RAW_PART 2 /* raw partition: xx?c */ +/* + * There is no physical disklabel on disk, since it is constructed from + * the MacOS partition table. + * However, to prevent disklabel -r to kill the disk, define a dummy + * offset outside of vital structures. + */ +#define LABELOFFSET 64 /* offset of label in sector */ + /* Just a dummy */ struct cpu_disklabel { /* EMPTY */ -- cgit v1.2.3