From owner-svn-src-all@FreeBSD.ORG Sun Apr 6 02:44:39 2014 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 3A1B8D0F; Sun, 6 Apr 2014 02:44:39 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 2589BA0A; Sun, 6 Apr 2014 02:44:39 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s362idnZ031485; Sun, 6 Apr 2014 02:44:39 GMT (envelope-from marcel@svn.freebsd.org) Received: (from marcel@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s362icEb031481; Sun, 6 Apr 2014 02:44:38 GMT (envelope-from marcel@svn.freebsd.org) Message-Id: <201404060244.s362icEb031481@svn.freebsd.org> From: Marcel Moolenaar Date: Sun, 6 Apr 2014 02:44:38 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r264185 - in head/sys: conf geom/label modules/geom/geom_label X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 06 Apr 2014 02:44:39 -0000 Author: marcel Date: Sun Apr 6 02:44:37 2014 New Revision: 264185 URL: http://svnweb.freebsd.org/changeset/base/264185 Log: 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. Modified: head/sys/conf/files head/sys/conf/options head/sys/geom/label/g_label.c head/sys/modules/geom/geom_label/Makefile Modified: head/sys/conf/files ============================================================================== --- head/sys/conf/files Sun Apr 6 02:20:42 2014 (r264184) +++ head/sys/conf/files Sun Apr 6 02:44:37 2014 (r264185) @@ -2684,14 +2684,14 @@ geom/geom_vfs.c standard geom/geom_vol_ffs.c optional geom_vol geom/journal/g_journal.c optional geom_journal geom/journal/g_journal_ufs.c optional geom_journal -geom/label/g_label.c optional geom_label +geom/label/g_label.c optional geom_label | geom_label_gpt 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 +geom/label/g_label_gpt.c optional geom_label | geom_label_gpt geom/label/g_label_disk_ident.c optional geom_label geom/linux_lvm/g_linux_lvm.c optional geom_linux_lvm geom/mirror/g_mirror.c optional geom_mirror Modified: head/sys/conf/options ============================================================================== --- head/sys/conf/options Sun Apr 6 02:20:42 2014 (r264184) +++ head/sys/conf/options Sun Apr 6 02:44:37 2014 (r264185) @@ -102,6 +102,7 @@ GEOM_FOX opt_geom.h GEOM_GATE opt_geom.h GEOM_JOURNAL opt_geom.h GEOM_LABEL opt_geom.h +GEOM_LABEL_GPT opt_geom.h GEOM_LINUX_LVM opt_geom.h GEOM_MBR opt_geom.h GEOM_MIRROR opt_geom.h Modified: head/sys/geom/label/g_label.c ============================================================================== --- head/sys/geom/label/g_label.c Sun Apr 6 02:20:42 2014 (r264184) +++ head/sys/geom/label/g_label.c Sun Apr 6 02:44:37 2014 (r264185) @@ -27,6 +27,8 @@ #include __FBSDID("$FreeBSD$"); +#include "opt_geom.h" + #include #include #include @@ -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 }; Modified: head/sys/modules/geom/geom_label/Makefile ============================================================================== --- head/sys/modules/geom/geom_label/Makefile Sun Apr 6 02:20:42 2014 (r264184) +++ head/sys/modules/geom/geom_label/Makefile Sun Apr 6 02:44:37 2014 (r264185) @@ -12,5 +12,9 @@ SRCS+= g_label_msdosfs.c SRCS+= g_label_ntfs.c SRCS+= g_label_reiserfs.c SRCS+= g_label_ufs.c +SRCS+= opt_geom.h + +opt_geom.h: + echo "#define GEOM_LABEL 1" > ${.TARGET} .include