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 /sbin | |
| 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 'sbin')
| -rw-r--r-- | sbin/disklabel/disklabel.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/sbin/disklabel/disklabel.c b/sbin/disklabel/disklabel.c index fccd0e15595..a723b098bb5 100644 --- a/sbin/disklabel/disklabel.c +++ b/sbin/disklabel/disklabel.c @@ -1,4 +1,4 @@ -/* $OpenBSD: disklabel.c,v 1.99 2006/09/24 20:29:52 krw Exp $ */ +/* $OpenBSD: disklabel.c,v 1.100 2006/09/26 23:33:04 krw Exp $ */ /* * Copyright (c) 1987, 1993 @@ -39,7 +39,7 @@ static const char copyright[] = #endif /* not lint */ #ifndef lint -static const char rcsid[] = "$OpenBSD: disklabel.c,v 1.99 2006/09/24 20:29:52 krw Exp $"; +static const char rcsid[] = "$OpenBSD: disklabel.c,v 1.100 2006/09/26 23:33:04 krw Exp $"; #endif /* not lint */ #include <sys/param.h> @@ -1071,8 +1071,6 @@ display(FILE *f, struct disklabel *lp, char **mp, char unit, int edit, fprintf(f, "label: %.*s\n", (int)sizeof(lp->d_packname), lp->d_packname); if (!edit) { fprintf(f, "flags:"); - if (lp->d_flags & D_REMOVABLE) - fprintf(f, " removable"); if (lp->d_flags & D_BADSECT) fprintf(f, " badsect"); putc('\n', f); @@ -1334,8 +1332,6 @@ getasciilabel(FILE *f, struct disklabel *lp) if (!strcmp(cp, "flags")) { for (v = 0; (cp = tp) && *cp != '\0';) { tp = word(cp); - if (!strcmp(cp, "removable")) - v |= D_REMOVABLE; else if (!strcmp(cp, "badsect")) v |= D_BADSECT; else { |