diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 1997-09-08 06:14:51 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 1997-09-08 06:14:51 +0000 |
| commit | 837b4cfba2f816b3574b917df820b0b34e5188e3 (patch) | |
| tree | eaac0bd97728656c9d1e233a01f3abc6b88611c8 /sys/arch | |
| parent | fe7ae024df01575397a50c75c2e4ece6b51ee906 (diff) | |
disklabel spoofing code; briggs
Diffstat (limited to 'sys/arch')
| -rw-r--r-- | sys/arch/mac68k/mac68k/disksubr.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/sys/arch/mac68k/mac68k/disksubr.c b/sys/arch/mac68k/mac68k/disksubr.c index a292e5a45cf..d99edd5ef47 100644 --- a/sys/arch/mac68k/mac68k/disksubr.c +++ b/sys/arch/mac68k/mac68k/disksubr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: disksubr.c,v 1.6 1997/08/20 20:57:32 deraadt Exp $ */ +/* $OpenBSD: disksubr.c,v 1.7 1997/09/08 06:14:50 deraadt Exp $ */ /* $NetBSD: disksubr.c,v 1.14 1996/05/05 06:18:22 briggs Exp $ */ /* @@ -486,10 +486,6 @@ readdisklabel(dev, strat, lp, osdep) } bp = geteblk((int)lp->d_secsize * MAXPARTITIONS); -i am breaking this code here to ensure that this will not compile until -cd9660 disklabel spoofing is added to the code. - - bp->b_dev = dev; bp->b_blkno = 0; bp->b_resid = 0; @@ -515,6 +511,11 @@ cd9660 disklabel spoofing is added to the code. } } +#if defined(CD9660) + if (msg && iso_disklabelspoof(dev, strat, lp) == 0) + msg = NULL; +#endif + bp->b_flags = B_INVAL | B_AGE | B_READ; brelse(bp); return (msg); |