support DIOCRLDINFO

6 files changed, 29 insertions, 6 deletions

diff --git a/sys/dev/ata/wd.c b/sys/dev/ata/wd.c
index 1c1c0e243ba..6200d445cde 100644
--- a/sys/dev/ata/wd.c
+++ b/sys/dev/ata/wd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: wd.c,v 1.5 1999/08/05 00:12:09 niklas Exp $ */
+/*	$OpenBSD: wd.c,v 1.6 1999/08/10 23:09:49 deraadt Exp $ */
 /*	$NetBSD: wd.c,v 1.193 1999/02/28 17:15:27 explorer Exp $ */
 
 /*
@@ -890,6 +890,10 @@ wdioctl(dev, xfer, addr, flag, p)
 		return 0;
 #endif
 
+	case DIOCRLDINFO:
+		wdgetdisklabel(dev, wd, wd->sc_dk.dk_label,
+		    wd->sc_dk.dk_cpulabel, 0);
+		return 0;
 	case DIOCGPDINFO: {
 			struct cpu_disklabel osdep;
 
diff --git a/sys/dev/atapi/acd.c b/sys/dev/atapi/acd.c
index 871537ff72e..96fa1b0e70f 100644
--- a/sys/dev/atapi/acd.c
+++ b/sys/dev/atapi/acd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: acd.c,v 1.35 1999/03/12 04:09:07 provos Exp $	*/
+/*	$OpenBSD: acd.c,v 1.36 1999/08/10 23:09:50 deraadt Exp $	*/
 
 /*
  * Copyright (c) 1996 Manuel Bouyer.  All rights reserved.
@@ -721,6 +721,9 @@ acdioctl(dev, cmd, addr, flag, p)
 		return EIO;
 
 	switch (cmd) {
+	case DIOCRLDINFO:
+		acdgetdisklabel(acd);
+		return 0;
 	case DIOCGDINFO:
 	case DIOCGPDINFO:
 		*(struct disklabel *)addr = *acd->sc_dk.dk_label;
diff --git a/sys/dev/isa/mcd.c b/sys/dev/isa/mcd.c
index fd4e85e6d4a..ca121d71aa7 100644
--- a/sys/dev/isa/mcd.c
+++ b/sys/dev/isa/mcd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mcd.c,v 1.27 1998/10/05 00:39:27 millert Exp $ */
+/*	$OpenBSD: mcd.c,v 1.28 1999/08/10 23:09:49 deraadt Exp $ */
 /*	$NetBSD: mcd.c,v 1.60 1998/01/14 12:14:41 drochner Exp $	*/
 
 /*
@@ -608,6 +608,10 @@ mcdioctl(dev, cmd, addr, flag, p)
 		return EIO;
 
 	switch (cmd) {
+	case DIOCRLDINFO:
+		mcdgetdisklabel(dev, sc, sc->sc_dk.dk_label,
+		    sc->sc_dk.dk_cpulabel, 0);
+		return 0;
 	case DIOCGDINFO:
 	case DIOCGPDINFO:
 		*(struct disklabel *)addr = *(sc->sc_dk.dk_label);
diff --git a/sys/dev/isa/wd.c b/sys/dev/isa/wd.c
index 56e6ebdbfdc..149a668a832 100644
--- a/sys/dev/isa/wd.c
+++ b/sys/dev/isa/wd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: wd.c,v 1.40 1999/05/09 20:40:43 weingart Exp $	*/
+/*	$OpenBSD: wd.c,v 1.41 1999/08/10 23:09:49 deraadt Exp $	*/
 /*	$NetBSD: wd.c,v 1.150 1996/05/12 23:54:03 mycroft Exp $ */
 
 /*
@@ -661,6 +661,10 @@ wdioctl(dev, xfer, addr, flag, p)
 		return 0;
 #endif
 
+	case DIOCRLDINFO:
+		wdgetdisklabel(dev, wd, wd->sc_dk.dk_label,
+		    wd->sc_dk.dk_cpulabel, 0);
+		return 0;
 	case DIOCGPDINFO: {
 			struct cpu_disklabel osdep;
 
diff --git a/sys/scsi/cd.c b/sys/scsi/cd.c
index 44419601619..3199c5af986 100644
--- a/sys/scsi/cd.c
+++ b/sys/scsi/cd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cd.c,v 1.39 1999/07/21 05:58:25 csapuntz Exp $	*/
+/*	$OpenBSD: cd.c,v 1.40 1999/08/10 23:09:49 deraadt Exp $	*/
 /*	$NetBSD: cd.c,v 1.100 1997/04/02 02:29:30 mycroft Exp $	*/
 
 /*
@@ -796,6 +796,10 @@ cdioctl(dev, cmd, addr, flag, p)
 	}
 
 	switch (cmd) {
+	case DIOCRLDINFO:
+		cdgetdisklabel(dev, cd, cd->sc_dk.dk_label,
+		    cd->sc_dk.dk_cpulabel, 0);
+		return 0;
 	case DIOCGDINFO:
 	case DIOCGPDINFO:
 		*(struct disklabel *)addr = *(cd->sc_dk.dk_label);
diff --git a/sys/scsi/sd.c b/sys/scsi/sd.c
index 708fdc21abb..b1c8cb3fa3b 100644
--- a/sys/scsi/sd.c
+++ b/sys/scsi/sd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: sd.c,v 1.38 1999/07/25 11:13:08 deraadt Exp $	*/
+/*	$OpenBSD: sd.c,v 1.39 1999/08/10 23:09:49 deraadt Exp $	*/
 /*	$NetBSD: sd.c,v 1.111 1997/04/02 02:29:41 mycroft Exp $	*/
 
 /*-
@@ -786,6 +786,10 @@ sdioctl(dev, cmd, addr, flag, p)
 	}
 
 	switch (cmd) {
+	case DIOCRLDINFO:
+		sdgetdisklabel(dev, sd, sd->sc_dk.dk_label,
+		    sd->sc_dk.dk_cpulabel, 0);
+		return 0;
 	case DIOCGPDINFO: {
 			struct cpu_disklabel osdep;