diff options
| author |   deraadt <deraadt@openbsd.org> | 1997-10-18 10:37:03 +0000 |
|---|---|---|
| committer | deraadt <deraadt@openbsd.org> | 1997-10-18 10:37:03 +0000 |
| commit | a61ae37bb32f92d6a6fea62c65d526a6ec668fd3 (patch) | |
| tree | d5c89497c672e4e2d5487e52bb1e09ab17a55308 /sys/dev/isa | |
| parent | do not create spoofed partition for DOSTYP_OPENBSD (diff) | |
| download | wireguard-openbsd-a61ae37bb32f92d6a6fea62c65d526a6ec668fd3.tar.xz wireguard-openbsd-a61ae37bb32f92d6a6fea62c65d526a6ec668fd3.zip | |
avoid "no disklabel" error messages
Diffstat (limited to 'sys/dev/isa')
| -rw-r--r-- | sys/dev/isa/fd.c | 8 | ||||
| -rw-r--r-- | sys/dev/isa/mcd.c | 4 | ||||
| -rw-r--r-- | sys/dev/isa/wd.c | 4 |
3 files changed, 9 insertions, 7 deletions
diff --git a/sys/dev/isa/fd.c b/sys/dev/isa/fd.c index adff6a5703d..492011434d1 100644 --- a/sys/dev/isa/fd.c +++ b/sys/dev/isa/fd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: fd.c,v 1.34 1997/04/07 22:48:08 rees Exp $ */ +/* $OpenBSD: fd.c,v 1.35 1997/10/18 10:37:09 deraadt Exp $ */ /* $NetBSD: fd.c,v 1.90 1996/05/12 23:12:03 mycroft Exp $ */ /*- @@ -993,8 +993,10 @@ fdioctl(dev, cmd, addr, flag, p) lp->d_checksum = dkcksum(lp); errstring = readdisklabel(dev, fdstrategy, lp, &cdl); - if (errstring) - printf("%s: %s\n", fd->sc_dev.dv_xname, errstring); + if (errstring) { + /*printf("%s: %s\n", fd->sc_dev.dv_xname, errstring); */ + return 0; + } *(struct disklabel *)addr = *lp; return 0; diff --git a/sys/dev/isa/mcd.c b/sys/dev/isa/mcd.c index 259e0ba9e91..4387d246872 100644 --- a/sys/dev/isa/mcd.c +++ b/sys/dev/isa/mcd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mcd.c,v 1.21 1997/09/29 12:01:27 mickey Exp $ */ +/* $OpenBSD: mcd.c,v 1.22 1997/10/18 10:37:12 deraadt Exp $ */ /* $NetBSD: mcd.c,v 1.49 1996/05/12 23:53:11 mycroft Exp $ */ /* @@ -722,7 +722,7 @@ mcdgetdisklabel(dev, sc) errstring = readdisklabel(MCDLABELDEV(dev), mcdstrategy, lp, sc->sc_dk.dk_cpulabel); if (errstring) { - printf("%s: %s\n", sc->sc_dev.dv_xname, errstring); + /*printf("%s: %s\n", sc->sc_dev.dv_xname, errstring);*/ return; } } diff --git a/sys/dev/isa/wd.c b/sys/dev/isa/wd.c index d79a46e3259..b4251a2d757 100644 --- a/sys/dev/isa/wd.c +++ b/sys/dev/isa/wd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: wd.c,v 1.29 1997/09/13 14:18:44 niklas Exp $ */ +/* $OpenBSD: wd.c,v 1.30 1997/10/18 10:37:14 deraadt Exp $ */ /* $NetBSD: wd.c,v 1.150 1996/05/12 23:54:03 mycroft Exp $ */ /* @@ -567,7 +567,7 @@ wdgetdisklabel(dev, wd) wd->sc_dk.dk_cpulabel); } if (errstring) { - printf("%s: %s\n", wd->sc_dev.dv_xname, errstring); + */printf("%s: %s\n", wd->sc_dev.dv_xname, errstring);*/ return; } |