diff options
| author | Marcel Moolenaar <marcel@FreeBSD.org> | 2014-04-06 02:44:37 +0000 |
|---|---|---|
| committer | Marcel Moolenaar <marcel@FreeBSD.org> | 2014-04-06 02:44:37 +0000 |
| commit | e8c166e85a893c2861ff9d40be435d100d1f9854 (patch) | |
| tree | c7c7c5d83361d1449e8fed22934d92b19147e201 /sys/geom | |
| parent | 12b2d77da9138382650bbec24545cef377b1b860 (diff) | |
| download | src-e8c166e85a893c2861ff9d40be435d100d1f9854.tar.gz src-e8c166e85a893c2861ff9d40be435d100d1f9854.zip | |
An all-or-nothing approach to labels isn't flexible enough. Embedded
systems need fine-grained control over what's in and what's out.
That's ideal. For now, separate GPT labels from the rest and allow
g_label to be built with just GPT labels.
Obtained from: Juniper Networks, Inc.
Notes
Notes:
svn path=/head/; revision=264185
Diffstat (limited to 'sys/geom')
| -rw-r--r-- | sys/geom/label/g_label.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/sys/geom/label/g_label.c b/sys/geom/label/g_label.c index fc16f7fb4f6f..ce1376e269ca 100644 --- a/sys/geom/label/g_label.c +++ b/sys/geom/label/g_label.c @@ -27,6 +27,8 @@ #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); +#include "opt_geom.h" + #include <sys/param.h> #include <sys/systm.h> #include <sys/kernel.h> @@ -80,6 +82,9 @@ struct g_class g_label_class = { * 6. Add your file system to manual page sbin/geom/class/label/glabel.8. */ const struct g_label_desc *g_labels[] = { + &g_label_gpt, + &g_label_gpt_uuid, +#ifdef GEOM_LABEL &g_label_ufs_id, &g_label_ufs_volume, &g_label_iso9660, @@ -87,9 +92,8 @@ const struct g_label_desc *g_labels[] = { &g_label_ext2fs, &g_label_reiserfs, &g_label_ntfs, - &g_label_gpt, - &g_label_gpt_uuid, &g_label_disk_ident, +#endif NULL }; |