Don't print the error strings returned by readdisklabel(). If you

need the debug info uncomment the printf's you need. Crude but
effective way to suppress 'no disklabel' errors that pop up at the
most innconvenient times to frighten users. More elegant method,
DPRINTF-like constructs or something, later.

"Yay!" marco@ ok deraadt@

3 files changed, 6 insertions, 6 deletions

diff --git a/sys/arch/sparc/dev/fd.c b/sys/arch/sparc/dev/fd.c
index 9f1977266a1..257d83fe0a2 100644
--- a/sys/arch/sparc/dev/fd.c
+++ b/sys/arch/sparc/dev/fd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: fd.c,v 1.46 2006/11/29 12:24:17 miod Exp $	*/
+/*	$OpenBSD: fd.c,v 1.47 2007/02/15 00:53:26 krw Exp $	*/
 /*	$NetBSD: fd.c,v 1.51 1997/05/24 20:16:19 pk Exp $	*/
 
 /*-
@@ -1985,7 +1985,7 @@ fdgetdisklabel(dev)
 	 */
 	errstring = readdisklabel(dev, fdstrategy, lp, clp, 0);
 	if (errstring) {
-		printf("%s: %s\n", fd->sc_dv.dv_xname, errstring);
+		/*printf("%s: %s\n", fd->sc_dv.dv_xname, errstring);*/
 	}
 }
 
diff --git a/sys/arch/sparc/dev/xd.c b/sys/arch/sparc/dev/xd.c
index 690fd0af3e4..1aa62b5e11e 100644
--- a/sys/arch/sparc/dev/xd.c
+++ b/sys/arch/sparc/dev/xd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: xd.c,v 1.33 2006/12/03 16:40:43 miod Exp $	*/
+/*	$OpenBSD: xd.c,v 1.34 2007/02/15 00:53:26 krw Exp $	*/
 /*	$NetBSD: xd.c,v 1.37 1997/07/29 09:58:16 fair Exp $	*/
 
 /*
@@ -309,7 +309,7 @@ xdgetdisklabel(xd, b)
 			    xddummystrat,
 			    xd->sc_dk.dk_label, xd->sc_dk.dk_cpulabel, 0);
 	if (err) {
-		printf("%s: %s\n", xd->sc_dev.dv_xname, err);
+		/*printf("%s: %s\n", xd->sc_dev.dv_xname, err);*/
 		return(XD_ERR_FAIL);
 	}
 
diff --git a/sys/arch/sparc/dev/xy.c b/sys/arch/sparc/dev/xy.c
index 9b4b3a7c53c..b89291a05f1 100644
--- a/sys/arch/sparc/dev/xy.c
+++ b/sys/arch/sparc/dev/xy.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: xy.c,v 1.29 2006/12/03 16:40:43 miod Exp $	*/
+/*	$OpenBSD: xy.c,v 1.30 2007/02/15 00:53:26 krw Exp $	*/
 /*	$NetBSD: xy.c,v 1.26 1997/07/19 21:43:56 pk Exp $	*/
 
 /*
@@ -249,7 +249,7 @@ xygetdisklabel(xy, b)
 					xydummystrat,
 				xy->sc_dk.dk_label, xy->sc_dk.dk_cpulabel, 0);
 	if (err) {
-		printf("%s: %s\n", xy->sc_dev.dv_xname, err);
+		/*printf("%s: %s\n", xy->sc_dev.dv_xname, err);*/
 		return(XY_ERR_FAIL);
 	}