diff options
| author | Miod Vallat <miod@cvs.openbsd.org> | 2005-03-29 16:36:00 +0000 |
|---|---|---|
| committer | Miod Vallat <miod@cvs.openbsd.org> | 2005-03-29 16:36:00 +0000 |
| commit | b6472d66bc5478a1bc5ca1a298b039bd2790a71e (patch) | |
| tree | 6792551967f4470cdc1b4455f0ed83e45aeb1985 /sys/arch/luna88k | |
| parent | 65f9a8eed7a46e9f463131460b8be9db51a8b103 (diff) | |
Plug iso_disklabelspoof() in readdisklabel(); requested by deraadt@
Diffstat (limited to 'sys/arch/luna88k')
| -rw-r--r-- | sys/arch/luna88k/luna88k/disksubr.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/sys/arch/luna88k/luna88k/disksubr.c b/sys/arch/luna88k/luna88k/disksubr.c index 3aec25a9e3e..3fdf632ccaa 100644 --- a/sys/arch/luna88k/luna88k/disksubr.c +++ b/sys/arch/luna88k/luna88k/disksubr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: disksubr.c,v 1.2 2004/06/14 12:57:02 aoyama Exp $ */ +/* $OpenBSD: disksubr.c,v 1.3 2005/03/29 16:35:59 miod Exp $ */ /* $NetBSD: disksubr.c,v 1.12 2002/02/19 17:09:44 wiz Exp $ */ /* @@ -164,6 +164,11 @@ readdisklabel(dev, strat, lp, clp, spoofonly) if (error) return ("disk label read error"); +#if defined(CD9660) + if (iso_disklabelspoof(dev, strat, lp) == 0) + return (NULL); +#endif + /* Check for a BSD disk label first. */ dlp = (struct disklabel *)(clp->cd_block + LABELOFFSET); if (dlp->d_magic == DISKMAGIC && dlp->d_magic2 == DISKMAGIC) { |