avoid "no disklabel" error messages

9 files changed, 21 insertions, 19 deletions

diff --git a/sys/arch/pmax/dev/rz.c b/sys/arch/pmax/dev/rz.c
index a695cd3a6de..a8c472a6c1f 100644
--- a/sys/arch/pmax/dev/rz.c
+++ b/sys/arch/pmax/dev/rz.c
@@ -818,7 +818,7 @@ rzgetinfo(dev)
 	msg = readdisklabel(dev, rzstrategy, lp, &cd);
 	if (msg == NULL)
 		return;
-	printf("rz%d: WARNING: %s\n", unit, msg);
+	/*printf("rz%d: WARNING: %s\n", unit, msg);*/
 
 #ifdef	COMPAT_ULTRIX
 	/*
diff --git a/sys/dev/atapi/acd.c b/sys/dev/atapi/acd.c
index 1006396b834..3243989750b 100644
--- a/sys/dev/atapi/acd.c
+++ b/sys/dev/atapi/acd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: acd.c,v 1.28 1997/09/11 11:20:45 deraadt Exp $	*/
+/*	$OpenBSD: acd.c,v 1.29 1997/10/18 10:37:06 deraadt Exp $	*/
 
 /*
  * Copyright (c) 1996 Manuel Bouyer.  All rights reserved.
@@ -1083,8 +1083,8 @@ acdgetdisklabel(acd)
 		errstring = readdisklabel(MAKECDDEV(0, acd->sc_dev.dv_unit,
 		    RAW_PART), acdstrategy, lp, acd->sc_dk.dk_cpulabel);
 #endif
-		if (errstring)
-			printf("%s: %s\n", acd->sc_dev.dv_xname, errstring);
+		/*if (errstring)
+			printf("%s: %s\n", acd->sc_dev.dv_xname, errstring);*/
 	}
 
 done:
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;
 	}
 
diff --git a/sys/dev/ramdisk.c b/sys/dev/ramdisk.c
index 9ed1110f412..be0809ee45a 100644
--- a/sys/dev/ramdisk.c
+++ b/sys/dev/ramdisk.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ramdisk.c,v 1.6 1997/02/06 04:30:35 rahnds Exp $	*/
+/*	$OpenBSD: ramdisk.c,v 1.7 1997/10/18 10:37:03 deraadt Exp $	*/
 /*	$NetBSD: ramdisk.c,v 1.8 1996/04/12 08:30:09 leo Exp $	*/
 
 /*
@@ -523,7 +523,7 @@ rdgetdisklabel(dev, sc)
 	 */
 	errstring = readdisklabel(RDLABELDEV(dev), rdstrategy, &lp, &clp);
 	if (errstring) {
-		printf("%s: %s\n", sc->sc_dev.dv_xname, errstring);
+		/*printf("%s: %s\n", sc->sc_dev.dv_xname, errstring);*/
 		return NULL;
 	}
 	return &lp;
diff --git a/sys/dev/vnd.c b/sys/dev/vnd.c
index 63acb349858..13fc74bac7e 100644
--- a/sys/dev/vnd.c
+++ b/sys/dev/vnd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: vnd.c,v 1.18 1997/10/06 20:19:40 deraadt Exp $	*/
+/*	$OpenBSD: vnd.c,v 1.19 1997/10/18 10:37:04 deraadt Exp $	*/
 /*	$NetBSD: vnd.c,v 1.26 1996/03/30 23:06:11 christos Exp $	*/
 
 /*
@@ -296,7 +296,7 @@ vndgetdisklabel(dev, sc)
 	errstring = readdisklabel(VNDLABELDEV(dev), vndstrategy, 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/scsi/cd.c b/sys/scsi/cd.c
index 576066d8463..cc01a96c929 100644
--- a/sys/scsi/cd.c
+++ b/sys/scsi/cd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cd.c,v 1.27 1997/10/15 09:35:00 provos Exp $	*/
+/*	$OpenBSD: cd.c,v 1.28 1997/10/18 10:37:16 deraadt Exp $	*/
 /*	$NetBSD: cd.c,v 1.100 1997/04/02 02:29:30 mycroft Exp $	*/
 
 /*
@@ -1086,7 +1086,7 @@ cdgetdisklabel(dev, cd)
 	errstring = readdisklabel(CDLABELDEV(dev), cdstrategy, lp,
 	    cd->sc_dk.dk_cpulabel);
 	if (errstring) {
-		printf("%s: %s\n", cd->sc_dev.dv_xname, errstring);
+		/*printf("%s: %s\n", cd->sc_dev.dv_xname, errstring);*/
 		return;
 	}
 }
diff --git a/sys/scsi/sd.c b/sys/scsi/sd.c
index 56b01e9cacb..821aff68dc5 100644
--- a/sys/scsi/sd.c
+++ b/sys/scsi/sd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: sd.c,v 1.25 1997/08/08 21:47:06 niklas Exp $	*/
+/*	$OpenBSD: sd.c,v 1.26 1997/10/18 10:37:19 deraadt Exp $	*/
 /*	$NetBSD: sd.c,v 1.111 1997/04/02 02:29:41 mycroft Exp $	*/
 
 /*
@@ -838,7 +838,7 @@ sdgetdisklabel(dev, sd)
 	errstring = readdisklabel(SDLABELDEV(dev), sdstrategy, lp,
 	    sd->sc_dk.dk_cpulabel);
 	if (errstring) {
-		printf("%s: %s\n", sd->sc_dev.dv_xname, errstring);
+		/*printf("%s: %s\n", sd->sc_dev.dv_xname, errstring);*/
 		return;
 	}
 }