summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorattilio <attilio@FreeBSD.org>2012-10-18 22:18:11 +0000
committerattilio <attilio@FreeBSD.org>2012-10-18 22:18:11 +0000
commitff4947736d21e61c68fb6c89134419fb32263ae3 (patch)
tree8f21d6d2faddf86947d3dd9b5da17bbdd30f066a
parent0a3cd6fb1a5d33eabf957b5c3a05cec28ba61806 (diff)
downloadFreeBSD-src-ff4947736d21e61c68fb6c89134419fb32263ae3.zip
FreeBSD-src-ff4947736d21e61c68fb6c89134419fb32263ae3.tar.gz
It seems that it is preferable to keep support for glabel also for
filesystems that we don't support natively. Revert part of r241636 to do so. This patch is not targeted for MFC. Requested by: gleb, jhb
-rw-r--r--sys/conf/files1
-rw-r--r--sys/geom/label/g_label.c1
-rw-r--r--sys/geom/label/g_label.h1
-rw-r--r--sys/modules/geom/geom_label/Makefile1
4 files changed, 4 insertions, 0 deletions
diff --git a/sys/conf/files b/sys/conf/files
index 197956c..2628414 100644
--- a/sys/conf/files
+++ b/sys/conf/files
@@ -2446,6 +2446,7 @@ geom/label/g_label.c optional geom_label
geom/label/g_label_ext2fs.c optional geom_label
geom/label/g_label_iso9660.c optional geom_label
geom/label/g_label_msdosfs.c optional geom_label
+geom/label/g_label_ntfs.c optional geom_label
geom/label/g_label_reiserfs.c optional geom_label
geom/label/g_label_ufs.c optional geom_label
geom/label/g_label_gpt.c optional geom_label
diff --git a/sys/geom/label/g_label.c b/sys/geom/label/g_label.c
index 5eb908f..0d8a3b4 100644
--- a/sys/geom/label/g_label.c
+++ b/sys/geom/label/g_label.c
@@ -84,6 +84,7 @@ const struct g_label_desc *g_labels[] = {
&g_label_msdosfs,
&g_label_ext2fs,
&g_label_reiserfs,
+ &g_label_ntfs,
&g_label_gpt,
&g_label_gpt_uuid,
NULL
diff --git a/sys/geom/label/g_label.h b/sys/geom/label/g_label.h
index 00028fb..06ba2f5 100644
--- a/sys/geom/label/g_label.h
+++ b/sys/geom/label/g_label.h
@@ -84,6 +84,7 @@ extern struct g_label_desc g_label_iso9660;
extern struct g_label_desc g_label_msdosfs;
extern struct g_label_desc g_label_ext2fs;
extern struct g_label_desc g_label_reiserfs;
+extern struct g_label_desc g_label_ntfs;
extern struct g_label_desc g_label_gpt;
extern struct g_label_desc g_label_gpt_uuid;
#endif /* _KERNEL */
diff --git a/sys/modules/geom/geom_label/Makefile b/sys/modules/geom/geom_label/Makefile
index 3c09986..300606a 100644
--- a/sys/modules/geom/geom_label/Makefile
+++ b/sys/modules/geom/geom_label/Makefile
@@ -8,6 +8,7 @@ SRCS+= g_label_ext2fs.c
SRCS+= g_label_gpt.c
SRCS+= g_label_iso9660.c
SRCS+= g_label_msdosfs.c
+SRCS+= g_label_ntfs.c
SRCS+= g_label_reiserfs.c
SRCS+= g_label_ufs.c
OpenPOWER on IntegriCloud