summaryrefslogtreecommitdiff
path: root/sys/scsi/cd.c
diff options
context:
space:
mode:
authorJoel Sing <jsing@cvs.openbsd.org>2010-04-23 15:25:22 +0000
committerJoel Sing <jsing@cvs.openbsd.org>2010-04-23 15:25:22 +0000
commit38fc778c9782dbaa70fa6da92cfd8daaaa43d6fe (patch)
treeae3cdf39a2c58715ddd572c6ba0e0e6d72ea4ce2 /sys/scsi/cd.c
parented069888a3c009f9af5ecffb1dd73b037a5b95c2 (diff)
Recycle unused disklabel fields in order to create a disklabel unique
identifier, allowing the disk to be identified without relying on the device name. ok deraadt@ krw@ beck@ marco@ todd@
Diffstat (limited to 'sys/scsi/cd.c')
-rw-r--r--sys/scsi/cd.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/sys/scsi/cd.c b/sys/scsi/cd.c
index 3f49a9a1e5c..bb876022113 100644
--- a/sys/scsi/cd.c
+++ b/sys/scsi/cd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cd.c,v 1.165 2010/04/12 09:51:48 dlg Exp $ */
+/* $OpenBSD: cd.c,v 1.166 2010/04/23 15:25:21 jsing Exp $ */
/* $NetBSD: cd.c,v 1.100 1997/04/02 02:29:30 mycroft Exp $ */
/*
@@ -1198,8 +1198,6 @@ cdgetdisklabel(dev_t dev, struct cd_softc *sc, struct disklabel *lp,
strncpy(lp->d_packname, "fictitious", sizeof(lp->d_packname));
DL_SETDSIZE(lp, sc->sc_params.disksize);
- lp->d_rpm = 300;
- lp->d_interleave = 1;
lp->d_version = 1;
/* XXX - these values for BBSIZE and SBSIZE assume ffs */