diff options
| author | Kenneth R Westerback <krw@cvs.openbsd.org> | 2006-09-26 23:33:05 +0000 |
|---|---|---|
| committer | Kenneth R Westerback <krw@cvs.openbsd.org> | 2006-09-26 23:33:05 +0000 |
| commit | 2bf9309e28746a4b6a52286fbfaa52035e8bc80e (patch) | |
| tree | 1a0c40b9e97feb2a6762ccc9486778b4e20fb856 /sys/arch | |
| parent | ecd84bf31bad64b35b9fc94c35074f968296f988 (diff) | |
Zap D_REMOVABLE flag from disklabel. If you didn't already know that
floppies and cd's were removable, displaying that fact in disklabel
output was unlikely to help. And the display in disklabel was the only
use of D_REMOVABLE in the tree.
ok marco@
Diffstat (limited to 'sys/arch')
| -rw-r--r-- | sys/arch/amd64/stand/libsa/diskprobe.c | 3 | ||||
| -rw-r--r-- | sys/arch/i386/stand/libsa/diskprobe.c | 3 | ||||
| -rw-r--r-- | sys/arch/sparc/dev/fd.c | 3 | ||||
| -rw-r--r-- | sys/arch/sparc64/dev/fd.c | 3 |
4 files changed, 4 insertions, 8 deletions
diff --git a/sys/arch/amd64/stand/libsa/diskprobe.c b/sys/arch/amd64/stand/libsa/diskprobe.c index ddb8990b963..d728a5a7ae0 100644 --- a/sys/arch/amd64/stand/libsa/diskprobe.c +++ b/sys/arch/amd64/stand/libsa/diskprobe.c @@ -1,4 +1,4 @@ -/* $OpenBSD: diskprobe.c,v 1.3 2004/08/21 18:53:38 tom Exp $ */ +/* $OpenBSD: diskprobe.c,v 1.4 2006/09/26 23:33:04 krw Exp $ */ /* * Copyright (c) 1997 Tobias Weingartner @@ -255,7 +255,6 @@ cdprobe(void) dip->disklabel.d_secperunit = 100; dip->disklabel.d_rpm = 300; dip->disklabel.d_interleave = 1; - dip->disklabel.d_flags = D_REMOVABLE; dip->disklabel.d_bbsize = 2048; dip->disklabel.d_sbsize = 2048; diff --git a/sys/arch/i386/stand/libsa/diskprobe.c b/sys/arch/i386/stand/libsa/diskprobe.c index 838117b6a7c..d44228245e1 100644 --- a/sys/arch/i386/stand/libsa/diskprobe.c +++ b/sys/arch/i386/stand/libsa/diskprobe.c @@ -1,4 +1,4 @@ -/* $OpenBSD: diskprobe.c,v 1.27 2004/06/23 00:21:49 tom Exp $ */ +/* $OpenBSD: diskprobe.c,v 1.28 2006/09/26 23:33:04 krw Exp $ */ /* * Copyright (c) 1997 Tobias Weingartner @@ -259,7 +259,6 @@ cdprobe(void) dip->disklabel.d_secperunit = 100; dip->disklabel.d_rpm = 300; dip->disklabel.d_interleave = 1; - dip->disklabel.d_flags = D_REMOVABLE; dip->disklabel.d_bbsize = 2048; dip->disklabel.d_sbsize = 2048; diff --git a/sys/arch/sparc/dev/fd.c b/sys/arch/sparc/dev/fd.c index 77d353c2e3b..3642726a299 100644 --- a/sys/arch/sparc/dev/fd.c +++ b/sys/arch/sparc/dev/fd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: fd.c,v 1.44 2006/03/15 20:20:41 miod Exp $ */ +/* $OpenBSD: fd.c,v 1.45 2006/09/26 23:33:04 krw Exp $ */ /* $NetBSD: fd.c,v 1.51 1997/05/24 20:16:19 pk Exp $ */ /*- @@ -1972,7 +1972,6 @@ 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_flags = D_REMOVABLE; lp->d_partitions[RAW_PART].p_offset = 0; lp->d_partitions[RAW_PART].p_size = lp->d_secpercyl * lp->d_ncylinders; diff --git a/sys/arch/sparc64/dev/fd.c b/sys/arch/sparc64/dev/fd.c index 750966ffab7..04f71364c2c 100644 --- a/sys/arch/sparc64/dev/fd.c +++ b/sys/arch/sparc64/dev/fd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: fd.c,v 1.6 2006/03/15 20:20:41 miod Exp $ */ +/* $OpenBSD: fd.c,v 1.7 2006/09/26 23:33:04 krw Exp $ */ /* $NetBSD: fd.c,v 1.112 2003/08/07 16:29:35 agc Exp $ */ /*- @@ -2021,7 +2021,6 @@ 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_flags = D_REMOVABLE; lp->d_partitions[RAW_PART].p_offset = 0; lp->d_partitions[RAW_PART].p_size = lp->d_secpercyl * lp->d_ncylinders; |