diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 1997-05-28 21:38:35 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 1997-05-28 21:38:35 +0000 |
| commit | 6ebe26c2ad904843417d9d9a4ca4ff69b7783ac4 (patch) | |
| tree | fa96176ab4860265036f68a8c301c0ca3325f735 /sys/arch | |
| parent | 596f37e05aebe8dc1008fd68b0866d1b6d1ba51f (diff) | |
cd9660 spoof elsewhere
Diffstat (limited to 'sys/arch')
| -rw-r--r-- | sys/arch/sparc/sparc/disksubr.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sys/arch/sparc/sparc/disksubr.c b/sys/arch/sparc/sparc/disksubr.c index 23fbcd53884..80de4225458 100644 --- a/sys/arch/sparc/sparc/disksubr.c +++ b/sys/arch/sparc/sparc/disksubr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: disksubr.c,v 1.14 1997/05/13 08:51:19 deraadt Exp $ */ +/* $OpenBSD: disksubr.c,v 1.15 1997/05/28 21:38:34 deraadt Exp $ */ /* $NetBSD: disksubr.c,v 1.16 1996/04/28 20:25:59 thorpej Exp $ */ /* @@ -156,10 +156,6 @@ readdisklabel(dev, strat, lp, clp) lp->d_bbsize = 8192; lp->d_sbsize = 64*1024; /* XXX ? */ -#if defined(CD9660) - if (iso_disklabelspoof(dev, strat, lp) == 0) - return (NULL); -#endif /* obtain buffer to probe drive with */ bp = geteblk((int)lp->d_secsize); @@ -196,6 +192,10 @@ readdisklabel(dev, strat, lp, clp) return (NULL); } +#if defined(CD9660) + if (iso_disklabelspoof(dev, strat, lp) == 0) + return (NULL); +#endif bzero(clp->cd_block, sizeof(clp->cd_block)); return ("no disk label"); } |