all drivers should spoof version 1 labels

15 files changed, 31 insertions, 17 deletions

diff --git a/sys/arch/hp300/dev/hd.c b/sys/arch/hp300/dev/hd.c
index 8e577a1ea97..13abead54f5 100644
--- a/sys/arch/hp300/dev/hd.c
+++ b/sys/arch/hp300/dev/hd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: hd.c,v 1.49 2007/06/06 17:15:11 deraadt Exp $	*/
+/*	$OpenBSD: hd.c,v 1.50 2007/06/08 05:27:58 deraadt Exp $	*/
 /*	$NetBSD: rd.c,v 1.33 1997/07/10 18:14:08 kleink Exp $	*/
 
 /*
@@ -513,6 +513,7 @@ hdgetdisklabel(dev, rs, lp, clp, spoofonly)
 	lp->d_rpm = 3600;
 	lp->d_interleave = 1;
 	lp->d_flags = 0;
+	lp->d_version = 1;
 
 	/* XXX - these values for BBSIZE and SBSIZE assume ffs */
 	lp->d_bbsize = BBSIZE;
diff --git a/sys/arch/sparc/dev/fd.c b/sys/arch/sparc/dev/fd.c
index 61e85053746..c36b5b439fc 100644
--- a/sys/arch/sparc/dev/fd.c
+++ b/sys/arch/sparc/dev/fd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: fd.c,v 1.52 2007/06/07 00:14:20 deraadt Exp $	*/
+/*	$OpenBSD: fd.c,v 1.53 2007/06/08 05:27:58 deraadt Exp $	*/
 /*	$NetBSD: fd.c,v 1.51 1997/05/24 20:16:19 pk Exp $	*/
 
 /*-
@@ -1970,6 +1970,7 @@ fdgetdisklabel(dev)
 	strncpy(lp->d_typename, "floppy disk", sizeof(lp->d_typename));
 	strncpy(lp->d_packname, "fictitious", sizeof(lp->d_packname));
 	lp->d_interleave = 1;
+	lp->d_version = 1;
 
 	lp->d_magic = DISKMAGIC;
 	lp->d_magic2 = DISKMAGIC;
diff --git a/sys/arch/sparc/dev/presto.c b/sys/arch/sparc/dev/presto.c
index ddbd32f56e4..a454bcb071f 100644
--- a/sys/arch/sparc/dev/presto.c
+++ b/sys/arch/sparc/dev/presto.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: presto.c,v 1.10 2007/06/06 17:15:12 deraadt Exp $	*/
+/*	$OpenBSD: presto.c,v 1.11 2007/06/08 05:27:58 deraadt Exp $	*/
 /*
  * Copyright (c) 2003, Miodrag Vallat.
  * All rights reserved.
@@ -387,6 +387,7 @@ presto_getdisklabel(dev_t dev, struct presto_softc *sc)
 	strncpy(lp->d_packname, sc->sc_model, 16);
 	lp->d_rpm = 3600;
 	lp->d_interleave = 1;
+	lp->d_version = 1;
 
 	lp->d_magic = DISKMAGIC;
 	lp->d_magic2 = DISKMAGIC;
diff --git a/sys/arch/sparc64/dev/fd.c b/sys/arch/sparc64/dev/fd.c
index 669675cbecc..5b4f353f567 100644
--- a/sys/arch/sparc64/dev/fd.c
+++ b/sys/arch/sparc64/dev/fd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: fd.c,v 1.15 2007/06/06 21:56:14 deraadt Exp $	*/
+/*	$OpenBSD: fd.c,v 1.16 2007/06/08 05:27:58 deraadt Exp $	*/
 /*	$NetBSD: fd.c,v 1.112 2003/08/07 16:29:35 agc Exp $	*/
 
 /*-
@@ -2024,6 +2024,7 @@ fdgetdisklabel(dev)
 	strncpy(lp->d_typename, "floppy disk", sizeof(lp->d_typename));
 	strncpy(lp->d_packname, "fictitious", sizeof(lp->d_packname));
 	lp->d_interleave = 1;
+	lp->d_version = 1;
 
 	lp->d_magic = DISKMAGIC;
 	lp->d_magic2 = DISKMAGIC;
diff --git a/sys/arch/zaurus/dev/zaurus_flash.c b/sys/arch/zaurus/dev/zaurus_flash.c
index 15b269a268e..c373a891c03 100644
--- a/sys/arch/zaurus/dev/zaurus_flash.c
+++ b/sys/arch/zaurus/dev/zaurus_flash.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: zaurus_flash.c,v 1.2 2007/06/05 00:38:20 deraadt Exp $	*/
+/*	$OpenBSD: zaurus_flash.c,v 1.3 2007/06/08 05:27:58 deraadt Exp $	*/
 
 /*
  * Copyright (c) 2005 Uwe Stuehler <uwe@openbsd.org>
@@ -376,9 +376,9 @@ zflash_default_disklabel(void *arg, dev_t dev, struct disklabel *lp,
 	DL_SETPOFFSET(&lp->d_partitions[10],
 	    DL_GETPOFFSET(&lp->d_partitions[9]) + DL_GETPSIZE(&lp->d_partitions[9]));
 	lp->d_partitions[10].p_fstype = FS_OTHER;
-
 	lp->d_npartitions = 11;
 
+	lp->d_version = 1;
 	/* Re-calculate the checksum. */
 	lp->d_checksum = dkcksum(lp);
 }
diff --git a/sys/dev/ata/wd.c b/sys/dev/ata/wd.c
index 191cffe26cd..834f9a52c9b 100644
--- a/sys/dev/ata/wd.c
+++ b/sys/dev/ata/wd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: wd.c,v 1.63 2007/06/07 03:50:20 ray Exp $ */
+/*	$OpenBSD: wd.c,v 1.64 2007/06/08 05:27:58 deraadt Exp $ */
 /*	$NetBSD: wd.c,v 1.193 1999/02/28 17:15:27 explorer Exp $ */
 
 /*
@@ -789,6 +789,7 @@ wdgetdefaultlabel(struct wd_softc *wd, struct disklabel *lp)
 	lp->d_rpm = 3600;
 	lp->d_interleave = 1;
 	lp->d_flags = 0;
+	lp->d_version = 1;
 
 	lp->d_magic = DISKMAGIC;
 	lp->d_magic2 = DISKMAGIC;
diff --git a/sys/dev/ccd.c b/sys/dev/ccd.c
index ada88857fd1..e0474a69293 100644
--- a/sys/dev/ccd.c
+++ b/sys/dev/ccd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ccd.c,v 1.76 2007/06/07 05:29:43 deraadt Exp $	*/
+/*	$OpenBSD: ccd.c,v 1.77 2007/06/08 05:27:58 deraadt Exp $	*/
 /*	$NetBSD: ccd.c,v 1.33 1996/05/05 04:21:14 thorpej Exp $	*/
 
 /*-
@@ -1383,6 +1383,7 @@ ccdgetdisklabel(dev_t dev, struct ccd_softc *cs, struct disklabel *lp,
 	strncpy(lp->d_packname, "fictitious", sizeof(lp->d_packname));
 	lp->d_interleave = 1;
 	lp->d_flags = 0;
+	lp->d_version = 1;
 
 	lp->d_magic = DISKMAGIC;
 	lp->d_magic2 = DISKMAGIC;
diff --git a/sys/dev/flash.c b/sys/dev/flash.c
index 3f1ff5b4b62..9824c2a03fd 100644
--- a/sys/dev/flash.c
+++ b/sys/dev/flash.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: flash.c,v 1.6 2007/06/07 05:29:43 deraadt Exp $	*/
+/*	$OpenBSD: flash.c,v 1.7 2007/06/08 05:27:58 deraadt Exp $	*/
 
 /*
  * Copyright (c) 2005 Uwe Stuehler <uwe@openbsd.org>
@@ -992,6 +992,7 @@ flashgetdefaultlabel(dev_t dev, struct flash_softc *sc,
 	/* Fake hardware characteristics. */
 	lp->d_rpm = 3600;
 	lp->d_interleave = 1;
+	lp->d_version = 1;
 
 	/* XXX these values assume ffs. */
 	lp->d_bbsize = BBSIZE;
diff --git a/sys/dev/isa/fd.c b/sys/dev/isa/fd.c
index 7144ccae957..2e8853e6132 100644
--- a/sys/dev/isa/fd.c
+++ b/sys/dev/isa/fd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: fd.c,v 1.65 2007/06/06 17:15:13 deraadt Exp $	*/
+/*	$OpenBSD: fd.c,v 1.66 2007/06/08 05:27:58 deraadt Exp $	*/
 /*	$NetBSD: fd.c,v 1.90 1996/05/12 23:12:03 mycroft Exp $	*/
 
 /*-
@@ -985,6 +985,7 @@ fdioctl(dev, cmd, addr, flag, p)
 		DL_SETDSIZE(lp, fd->sc_type->size);
 		lp->d_rpm = 300;
 		lp->d_interleave = 1;
+		lp->d_version = 1;
 
 		lp->d_magic = DISKMAGIC;
 		lp->d_magic2 = DISKMAGIC;
diff --git a/sys/dev/isa/mcd.c b/sys/dev/isa/mcd.c
index 805463f16e9..30b439fc979 100644
--- a/sys/dev/isa/mcd.c
+++ b/sys/dev/isa/mcd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mcd.c,v 1.46 2007/06/06 17:15:13 deraadt Exp $ */
+/*	$OpenBSD: mcd.c,v 1.47 2007/06/08 05:27:58 deraadt Exp $ */
 /*	$NetBSD: mcd.c,v 1.60 1998/01/14 12:14:41 drochner Exp $	*/
 
 /*
@@ -757,6 +757,7 @@ mcdgetdisklabel(dev, sc, lp, clp, spoofonly)
 	DL_SETDSIZE(lp, sc->disksize);
 	lp->d_rpm = 300;
 	lp->d_interleave = 1;
+	lp->d_version = 1;
 
 	lp->d_magic = DISKMAGIC;
 	lp->d_magic2 = DISKMAGIC;
diff --git a/sys/dev/raidframe/rf_openbsdkintf.c b/sys/dev/raidframe/rf_openbsdkintf.c
index d394175c90c..7a8a3052d70 100644
--- a/sys/dev/raidframe/rf_openbsdkintf.c
+++ b/sys/dev/raidframe/rf_openbsdkintf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: rf_openbsdkintf.c,v 1.38 2007/06/07 00:49:08 krw Exp $	*/
+/* $OpenBSD: rf_openbsdkintf.c,v 1.39 2007/06/08 05:27:58 deraadt Exp $	*/
 /* $NetBSD: rf_netbsdkintf.c,v 1.109 2001/07/27 03:30:07 oster Exp $	*/
 
 /*-
@@ -2108,8 +2108,9 @@ raidgetdefaultlabel(RF_Raid_t *raidPtr, struct raid_softc *rs,
 	lp->d_type = DTYPE_RAID;
 	strncpy(lp->d_packname, "fictitious", sizeof(lp->d_packname));
 	lp->d_rpm = 3600;
-	lp->d_interleave = 1;
 	lp->d_flags = 0;
+	lp->d_interleave = 1;
+	lp->d_version = 1;
 
 	DL_SETPOFFSET(&lp->d_partitions[RAW_PART], 0);
 	DL_SETPSIZE(&lp->d_partitions[RAW_PART], raidPtr->totalSectors);
diff --git a/sys/dev/ramdisk.c b/sys/dev/ramdisk.c
index c2f138f3e7a..842966d6c02 100644
--- a/sys/dev/ramdisk.c
+++ b/sys/dev/ramdisk.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ramdisk.c,v 1.33 2007/06/06 17:15:13 deraadt Exp $	*/
+/*	$OpenBSD: ramdisk.c,v 1.34 2007/06/08 05:27:58 deraadt Exp $	*/
 /*	$NetBSD: ramdisk.c,v 1.8 1996/04/12 08:30:09 leo Exp $	*/
 
 /*
@@ -495,6 +495,7 @@ rdgetdisklabel(dev_t dev, struct rd_softc *sc)
 	DL_SETDSIZE(lp, lp->d_nsectors);
 	lp->d_rpm = 3600;
 	lp->d_interleave = 1;
+	lp->d_version = 1;
 
 	lp->d_magic = DISKMAGIC;
 	lp->d_magic2 = DISKMAGIC;
diff --git a/sys/dev/vnd.c b/sys/dev/vnd.c
index eeae63a60cd..92e452ef173 100644
--- a/sys/dev/vnd.c
+++ b/sys/dev/vnd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: vnd.c,v 1.77 2007/06/06 17:15:13 deraadt Exp $	*/
+/*	$OpenBSD: vnd.c,v 1.78 2007/06/08 05:27:58 deraadt Exp $	*/
 /*	$NetBSD: vnd.c,v 1.26 1996/03/30 23:06:11 christos Exp $	*/
 
 /*
@@ -313,6 +313,7 @@ vndgetdisklabel(dev_t dev, struct vnd_softc *sc)
 	lp->d_rpm = 3600;
 	lp->d_interleave = 1;
 	lp->d_flags = 0;
+	lp->d_version = 1;
 
 	lp->d_magic = DISKMAGIC;
 	lp->d_magic2 = DISKMAGIC;
diff --git a/sys/scsi/cd.c b/sys/scsi/cd.c
index bdc1137e8de..c9f83e99e54 100644
--- a/sys/scsi/cd.c
+++ b/sys/scsi/cd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cd.c,v 1.129 2007/06/07 05:29:44 deraadt Exp $	*/
+/*	$OpenBSD: cd.c,v 1.130 2007/06/08 05:27:58 deraadt Exp $	*/
 /*	$NetBSD: cd.c,v 1.100 1997/04/02 02:29:30 mycroft Exp $	*/
 
 /*
@@ -1180,6 +1180,7 @@ cdgetdisklabel(dev_t dev, struct cd_softc *cd, struct disklabel *lp,
 	DL_SETDSIZE(lp, cd->params.disksize);
 	lp->d_rpm = 300;
 	lp->d_interleave = 1;
+	lp->d_version = 1;
 
 	/* XXX - these values for BBSIZE and SBSIZE assume ffs */
 	lp->d_bbsize = BBSIZE;
diff --git a/sys/scsi/sd.c b/sys/scsi/sd.c
index 1d6eedf937f..5f1bbc3f2f4 100644
--- a/sys/scsi/sd.c
+++ b/sys/scsi/sd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: sd.c,v 1.132 2007/06/07 05:29:44 deraadt Exp $	*/
+/*	$OpenBSD: sd.c,v 1.133 2007/06/08 05:27:58 deraadt Exp $	*/
 /*	$NetBSD: sd.c,v 1.111 1997/04/02 02:29:41 mycroft Exp $	*/
 
 /*-
@@ -1032,6 +1032,7 @@ sdgetdisklabel(dev_t dev, struct sd_softc *sd, struct disklabel *lp,
 	DL_SETDSIZE(lp, sd->params.disksize);
 	lp->d_rpm = sd->params.rot_rate;
 	lp->d_interleave = 1;
+	lp->d_version = 1;
 	lp->d_flags = 0;
 
 	/* XXX - these values for BBSIZE and SBSIZE assume ffs */