Add a "spoofonly" argument to readdisklabel() which will be used to

implement an ioctl to get a spoofed label even for disks that have
a label on them.

8 files changed, 19 insertions, 19 deletions

diff --git a/sys/dev/atapi/acd.c b/sys/dev/atapi/acd.c
index 2efee890feb..344a24fb7ab 100644
--- a/sys/dev/atapi/acd.c
+++ b/sys/dev/atapi/acd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: acd.c,v 1.32 1998/07/12 01:20:20 deraadt Exp $	*/
+/*	$OpenBSD: acd.c,v 1.33 1998/10/03 21:18:59 millert Exp $	*/
 
 /*
  * Copyright (c) 1996 Manuel Bouyer.  All rights reserved.
@@ -1070,10 +1070,10 @@ acdgetdisklabel(acd)
 		 * does not yet work, for unknown reasons.
 		 */
 		errstring = readdisklabel(MAKECDDEV(0, acd->sc_dev.dv_unit,
-		    data_track), acdstrategy, lp, acd->sc_dk.dk_cpulabel);
+		    data_track), acdstrategy, lp, acd->sc_dk.dk_cpulabel, 0);
 #else
 		errstring = readdisklabel(MAKECDDEV(0, acd->sc_dev.dv_unit,
-		    RAW_PART), acdstrategy, lp, acd->sc_dk.dk_cpulabel);
+		    RAW_PART), acdstrategy, lp, acd->sc_dk.dk_cpulabel, 0);
 #endif
 		/*if (errstring)
 			printf("%s: %s\n", acd->sc_dev.dv_xname, errstring);*/
diff --git a/sys/dev/ccd.c b/sys/dev/ccd.c
index 575b5693981..97543402345 100644
--- a/sys/dev/ccd.c
+++ b/sys/dev/ccd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ccd.c,v 1.36 1998/08/04 21:26:35 millert Exp $	*/
+/*	$OpenBSD: ccd.c,v 1.37 1998/10/03 21:19:00 millert Exp $	*/
 /*	$NetBSD: ccd.c,v 1.33 1996/05/05 04:21:14 thorpej Exp $	*/
 
 /*-
@@ -1591,7 +1591,7 @@ ccdgetdisklabel(dev)
 	 * Call the generic disklabel extraction routine.
 	 */
 	errstring = readdisklabel(CCDLABELDEV(dev), ccdstrategy,
-	    cs->sc_dkdev.dk_label, cs->sc_dkdev.dk_cpulabel);
+	    cs->sc_dkdev.dk_label, cs->sc_dkdev.dk_cpulabel, 0);
 	if (errstring)
 		ccdmakedisklabel(cs);
 
diff --git a/sys/dev/isa/fd.c b/sys/dev/isa/fd.c
index 53a5fc92566..3d81c2add55 100644
--- a/sys/dev/isa/fd.c
+++ b/sys/dev/isa/fd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: fd.c,v 1.38 1998/08/08 23:01:13 downsj Exp $	*/
+/*	$OpenBSD: fd.c,v 1.39 1998/10/03 21:19:00 millert Exp $	*/
 /*	$NetBSD: fd.c,v 1.90 1996/05/12 23:12:03 mycroft Exp $	*/
 
 /*-
@@ -992,7 +992,7 @@ fdioctl(dev, cmd, addr, flag, p)
 		lp->d_magic2 = DISKMAGIC;
 		lp->d_checksum = dkcksum(lp);
 
-		errstring = readdisklabel(dev, fdstrategy, lp, &cdl);
+		errstring = readdisklabel(dev, fdstrategy, lp, &cdl, 0);
 		if (errstring) {
 			/*printf("%s: %s\n", fd->sc_dev.dv_xname, errstring); */
 		}
diff --git a/sys/dev/isa/mcd.c b/sys/dev/isa/mcd.c
index 602aee9a684..b88a7deb020 100644
--- a/sys/dev/isa/mcd.c
+++ b/sys/dev/isa/mcd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mcd.c,v 1.24 1998/04/26 21:02:49 provos Exp $ */
+/*	$OpenBSD: mcd.c,v 1.25 1998/10/03 21:19:00 millert Exp $ */
 /*	$NetBSD: mcd.c,v 1.60 1998/01/14 12:14:41 drochner Exp $	*/
 
 /*
@@ -747,7 +747,7 @@ mcdgetdefaultlabel(dev, sc, lp)
 	 * Call the generic disklabel extraction routine
 	 */
 	errstring = readdisklabel(MCDLABELDEV(dev), mcdstrategy, lp,
-	    sc->sc_dk.dk_cpulabel);
+	    sc->sc_dk.dk_cpulabel, 0);
 	if (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 772bd590d5d..ae447d4ecc5 100644
--- a/sys/dev/isa/wd.c
+++ b/sys/dev/isa/wd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: wd.c,v 1.36 1998/10/01 04:23:54 millert Exp $	*/
+/*	$OpenBSD: wd.c,v 1.37 1998/10/03 21:19:00 millert Exp $	*/
 /*	$NetBSD: wd.c,v 1.150 1996/05/12 23:54:03 mycroft Exp $ */
 
 /*
@@ -577,7 +577,7 @@ wdgetdisklabel(dev, wd)
 	if (d_link->sc_state > RECAL)
 		d_link->sc_state = RECAL;
 	errstring = readdisklabel(WDLABELDEV(dev), wdstrategy, lp,
-	    wd->sc_dk.dk_cpulabel);
+	    wd->sc_dk.dk_cpulabel, 0);
 	if (errstring) {
 		/*
 		 * This probably happened because the drive's default
@@ -588,7 +588,7 @@ wdgetdisklabel(dev, wd)
 		if (d_link->sc_state > GEOMETRY)
 			d_link->sc_state = GEOMETRY;
 		errstring = readdisklabel(WDLABELDEV(dev), wdstrategy, lp,
-		    wd->sc_dk.dk_cpulabel);
+		    wd->sc_dk.dk_cpulabel, 0);
 	}
 	if (errstring) {
 		/*printf("%s: %s\n", wd->sc_dev.dv_xname, errstring);*/
diff --git a/sys/dev/ofw/ofdisk.c b/sys/dev/ofw/ofdisk.c
index 132f87017a6..91ce384821a 100644
--- a/sys/dev/ofw/ofdisk.c
+++ b/sys/dev/ofw/ofdisk.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ofdisk.c,v 1.3 1997/11/07 08:07:22 niklas Exp $	*/
+/*	$OpenBSD: ofdisk.c,v 1.4 1998/10/03 21:19:01 millert Exp $	*/
 /*	$NetBSD: ofdisk.c,v 1.3 1996/10/13 01:38:13 christos Exp $	*/
 
 /*
@@ -176,8 +176,8 @@ ofdopen(dev, flags, fmt, p)
 		lp->d_partitions[RAW_PART].p_offset = 0;
 		lp->d_partitions[RAW_PART].p_size = lp->d_secperunit;
 		
-		readdisklabel(MAKEDISKDEV(major(dev), unit, RAW_PART), ofdstrategy,
-			      lp, of->sc_dk.dk_cpulabel);
+		readdisklabel(MAKEDISKDEV(major(dev), unit, RAW_PART),
+		    ofdstrategy, lp, of->sc_dk.dk_cpulabel, 0);
 	}
 
 	switch (fmt) {
diff --git a/sys/dev/ramdisk.c b/sys/dev/ramdisk.c
index be0809ee45a..2d6bcf448c0 100644
--- a/sys/dev/ramdisk.c
+++ b/sys/dev/ramdisk.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ramdisk.c,v 1.7 1997/10/18 10:37:03 deraadt Exp $	*/
+/*	$OpenBSD: ramdisk.c,v 1.8 1998/10/03 21:19:00 millert Exp $	*/
 /*	$NetBSD: ramdisk.c,v 1.8 1996/04/12 08:30:09 leo Exp $	*/
 
 /*
@@ -521,7 +521,7 @@ rdgetdisklabel(dev, sc)
 	/*
 	 * Call the generic disklabel extraction routine
 	 */
-	errstring = readdisklabel(RDLABELDEV(dev), rdstrategy, &lp, &clp);
+	errstring = readdisklabel(RDLABELDEV(dev), rdstrategy, &lp, &clp, 0);
 	if (errstring) {
 		/*printf("%s: %s\n", sc->sc_dev.dv_xname, errstring);*/
 		return NULL;
diff --git a/sys/dev/vnd.c b/sys/dev/vnd.c
index 41d1c176deb..6ec83b670f8 100644
--- a/sys/dev/vnd.c
+++ b/sys/dev/vnd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: vnd.c,v 1.22 1998/08/04 22:01:54 millert Exp $	*/
+/*	$OpenBSD: vnd.c,v 1.23 1998/10/03 21:19:00 millert Exp $	*/
 /*	$NetBSD: vnd.c,v 1.26 1996/03/30 23:06:11 christos Exp $	*/
 
 /*
@@ -294,7 +294,7 @@ vndgetdisklabel(dev, sc)
 	 * Call the generic disklabel extraction routine
 	 */
 	errstring = readdisklabel(VNDLABELDEV(dev), vndstrategy, lp,
-	    sc->sc_dk.dk_cpulabel);
+	    sc->sc_dk.dk_cpulabel, 0);
 	if (errstring) {
 		/*printf("%s: %s\n", sc->sc_dev.dv_xname, errstring);*/
 		return;