summaryrefslogtreecommitdiff
path: root/sbin/disklabel
diff options
context:
space:
mode:
authorTodd T. Fries <todd@cvs.openbsd.org>2007-06-01 21:51:16 +0000
committerTodd T. Fries <todd@cvs.openbsd.org>2007-06-01 21:51:16 +0000
commit525645839e46edc8f3ebaf8586f86b2197be0b37 (patch)
tree4168677db3fd718f0bd24a5669822ccd66020441 /sbin/disklabel
parenta711a8a80c6c373aaba94b4704464f6715ca663a (diff)
add RAID to the list of partition types for which we do not prompt for a
filesystem ok krw@
Diffstat (limited to 'sbin/disklabel')
-rw-r--r--sbin/disklabel/editor.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/sbin/disklabel/editor.c b/sbin/disklabel/editor.c
index d7e54e2f867..79e9245e32d 100644
--- a/sbin/disklabel/editor.c
+++ b/sbin/disklabel/editor.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: editor.c,v 1.113 2007/05/29 06:28:15 otto Exp $ */
+/* $OpenBSD: editor.c,v 1.114 2007/06/01 21:51:15 todd Exp $ */
/*
* Copyright (c) 1997-2000 Todd C. Miller <Todd.Miller@courtesan.com>
@@ -17,7 +17,7 @@
*/
#ifndef lint
-static char rcsid[] = "$OpenBSD: editor.c,v 1.113 2007/05/29 06:28:15 otto Exp $";
+static char rcsid[] = "$OpenBSD: editor.c,v 1.114 2007/06/01 21:51:15 todd Exp $";
#endif /* not lint */
#include <sys/types.h>
@@ -601,7 +601,8 @@ editor_name(struct disklabel *lp, char **mp, char *p)
/* Not all fstypes can be named */
if (pp->p_fstype == FS_UNUSED || pp->p_fstype == FS_SWAP ||
- pp->p_fstype == FS_BOOT || pp->p_fstype == FS_OTHER) {
+ pp->p_fstype == FS_BOOT || pp->p_fstype == FS_OTHER ||
+ pp->p_fstype == FS_RAID) {
fprintf(stderr, "You cannot name a filesystem of type %s.\n",
fstypenames[lp->d_partitions[partno].p_fstype]);
return;