diff options
| author | Todd C. Miller <millert@cvs.openbsd.org> | 1998-10-03 21:19:02 +0000 |
|---|---|---|
| committer | Todd C. Miller <millert@cvs.openbsd.org> | 1998-10-03 21:19:02 +0000 |
| commit | 2847382ad0f79d42676104f5b99c1b14a78a5b90 (patch) | |
| tree | 3e173e06925848427cc197fb15b7a2d7b3e5c12c /sys/dev/isa | |
| parent | 17219f15915dee86717b444ef5a7e0c11c2e9bb4 (diff) | |
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.
Diffstat (limited to 'sys/dev/isa')
| -rw-r--r-- | sys/dev/isa/fd.c | 4 | ||||
| -rw-r--r-- | sys/dev/isa/mcd.c | 4 | ||||
| -rw-r--r-- | sys/dev/isa/wd.c | 6 |
3 files changed, 7 insertions, 7 deletions
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);*/ |