diff options
| author | Marc Espie <espie@cvs.openbsd.org> | 2000-04-29 15:57:52 +0000 |
|---|---|---|
| committer | Marc Espie <espie@cvs.openbsd.org> | 2000-04-29 15:57:52 +0000 |
| commit | 445e05e2e6eacf9331b6482aaf38cb85c68e236c (patch) | |
| tree | 7f47d368cbf103c0308dfaa626f82db60f76dbbe /sys | |
| parent | 9347b7093b862f7b1bb3807c8f953d1d0c11a1e7 (diff) | |
From Lars Hecking <lhecking@nmrc.ucc.ie>:
grab NetBSD changes to recognize Linux ados labels,
so that OpenBSD can mount them (provided it doesn't run into
more endianness problems)
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/arch/amiga/amiga/adosglue.h | 5 | ||||
| -rw-r--r-- | sys/arch/amiga/amiga/disksubr.c | 7 |
2 files changed, 10 insertions, 2 deletions
diff --git a/sys/arch/amiga/amiga/adosglue.h b/sys/arch/amiga/amiga/adosglue.h index d080c4f89bf..36c2d3e8f2e 100644 --- a/sys/arch/amiga/amiga/adosglue.h +++ b/sys/arch/amiga/amiga/adosglue.h @@ -1,4 +1,4 @@ -/* $OpenBSD: adosglue.h,v 1.2 1996/06/04 12:49:11 niklas Exp $ */ +/* $OpenBSD: adosglue.h,v 1.3 2000/04/29 15:57:51 espie Exp $ */ /* $NetBSD: adosglue.h,v 1.4 1994/12/28 09:27:45 chopps Exp $ */ /* @@ -45,6 +45,8 @@ #define DOST_DOS 0x444f5300 /* 'DOSx' AmigaDos partition */ #define DOST_AMIX 0x554e4900 /* 'UNIx' AmigaDos partition */ #define DOST_MUFS 0x6d754600 /* 'muFx' AmigaDos partition (muFS) */ +#define DOST_EXT2 0x4c4e5800 /* 'LNX0' Linux fs partition (ext2fs) */ +#define DOST_LNXSWP 0x53575000 /* 'LNX0' Linux swap partition */ struct adostype { u_char archtype; /* see ADT_xxx below */ @@ -58,6 +60,7 @@ struct adostype { #define ADT_NETBSDSWAP 3 #define ADT_NETBSDUSER 4 #define ADT_AMIX 5 +#define ADT_EXT2 6 #define ISFSARCH_NETBSD(adt) \ ((adt).archtype >= ADT_NETBSDROOT && (adt).archtype <= ADT_NETBSDUSER) diff --git a/sys/arch/amiga/amiga/disksubr.c b/sys/arch/amiga/amiga/disksubr.c index 088aa8317b1..37723a58adb 100644 --- a/sys/arch/amiga/amiga/disksubr.c +++ b/sys/arch/amiga/amiga/disksubr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: disksubr.c,v 1.18 1999/01/08 04:29:04 millert Exp $ */ +/* $OpenBSD: disksubr.c,v 1.19 2000/04/29 15:57:51 espie Exp $ */ /* $NetBSD: disksubr.c,v 1.27 1996/10/13 03:06:34 christos Exp $ */ /* @@ -336,6 +336,7 @@ readdisklabel(dev, strat, lp, clp, spoofonly) case ADT_NETBSDUSER: case ADT_AMIGADOS: case ADT_AMIX: + case ADT_EXT2: case ADT_UNKNOWN: pp = &lp->d_partitions[lp->d_npartitions]; break; @@ -634,6 +635,10 @@ getadostype(dostype) printf(" using: 0x%x instead\n", dostype); #endif return (getadostype(dostype)); + case DOST_EXT2: + adt.archtype = ADT_EXT2; + adt.fstype = FS_EXT2FS; + return(adt); default: unknown: #ifdef DIAGNOSTIC |