Provide a set of sysctls and tunables to disable device node creation

for specific "kinds" of disk labels - for example, GPT UUIDs.  Reason
for this is that sometimes, other GEOM classes attach to these device
nodes instead of the proper ones - e.g. they attach to /dev/gptid/XXX
instead of /dev/ada0p2, which is annoying.

Reviewed by:	pjd (earlier version)
MFC after:	1 month

1 files changed, 9 insertions, 5 deletions

diff --git a/sys/geom/label/g_label_ufs.c b/sys/geom/label/g_label_ufs.c
index 8510fc0..b9b0443 100644
--- a/sys/geom/label/g_label_ufs.c
+++ b/sys/geom/label/g_label_ufs.c
@@ -137,13 +137,17 @@ g_label_ufs_id_taste(struct g_consumer *cp, char *label, size_t size)
 	g_label_ufs_taste_common(cp, label, size, G_LABEL_UFS_ID);
 }
 
-
-const struct g_label_desc g_label_ufs_volume = {
+struct g_label_desc g_label_ufs_volume = {
 	.ld_taste = g_label_ufs_volume_taste,
-	.ld_dir = G_LABEL_UFS_VOLUME_DIR
+	.ld_dir = G_LABEL_UFS_VOLUME_DIR,
+	.ld_enabled = 1
 };
 
-const struct g_label_desc g_label_ufs_id = {
+struct g_label_desc g_label_ufs_id = {
 	.ld_taste = g_label_ufs_id_taste,
-	.ld_dir = G_LABEL_UFS_ID_DIR
+	.ld_dir = G_LABEL_UFS_ID_DIR,
+	.ld_enabled = 1
 };
+
+G_LABEL_INIT(ufsid, g_label_ufs_id, "Create device nodes for UFS file system IDs");
+G_LABEL_INIT(ufs, g_label_ufs_volume, "Create device nodes for UFS volume names");