main - makefiles: add alias for device-mapper
by Zdenek Kabelac
Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=5509e764f1c542768b2...
Commit: 5509e764f1c542768b2dd5e39d2b900a96a3b281
Parent: 8d93d8b7b7f9ae90e56f171e694da0304ab3c6fe
Author: Zdenek Kabelac <zkabelac(a)redhat.com>
AuthorDate: Sun Feb 28 01:19:23 2021 +0100
Committer: Zdenek Kabelac <zkabelac(a)redhat.com>
CommitterDate: Tue Mar 2 22:54:40 2021 +0100
makefiles: add alias for device-mapper
Support also 'make device_mapper' so user is less confused.
---
Makefile.in | 1 +
libdm/make.tmpl.in | 1 +
make.tmpl.in | 1 +
3 files changed, 3 insertions(+)
diff --git a/Makefile.in b/Makefile.in
index 095f1f447..a4278cade 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -66,6 +66,7 @@ daemons.device-mapper: libdm.device-mapper
tools.device-mapper: libdm.device-mapper
scripts.device-mapper: include.device-mapper
device-mapper: tools.device-mapper daemons.device-mapper man.device-mapper
+device_mapper: device-mapper
ifeq ("@INTL@", "yes")
lib.pofile: include.pofile
diff --git a/libdm/make.tmpl.in b/libdm/make.tmpl.in
index aaf8a5e77..4a32b8f94 100644
--- a/libdm/make.tmpl.in
+++ b/libdm/make.tmpl.in
@@ -310,6 +310,7 @@ all: $(SUBDIRS) $(TARGETS)
install: all $(SUBDIRS.install)
install_device-mapper: $(SUBDIRS.install_device-mapper)
+install_device_mapper: install_device-mapper
cflow: $(SUBDIRS.cflow)
$(SUBDIRS): $(SUBDIRS.device-mapper)
diff --git a/make.tmpl.in b/make.tmpl.in
index 4549746ab..35d8267df 100644
--- a/make.tmpl.in
+++ b/make.tmpl.in
@@ -340,6 +340,7 @@ all: $(SUBDIRS) $(TARGETS)
install: all $(SUBDIRS.install)
install_cluster: all $(SUBDIRS.install_cluster)
install_device-mapper: $(SUBDIRS.install_device-mapper)
+install_device_mapper: install_device-mapper
install_lvm2: $(SUBDIRS.install_lvm2)
install_ocf: $(SUBDIRS.install_ocf)
cflow: $(SUBDIRS.cflow)
3 years, 1 month
main - makefiles: fix man-generate rule
by Zdenek Kabelac
Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=8d93d8b7b7f9ae90e56...
Commit: 8d93d8b7b7f9ae90e56f171e694da0304ab3c6fe
Parent: 824230e1e27c285eff98cec7497ef9474ceb4ddd
Author: Zdenek Kabelac <zkabelac(a)redhat.com>
AuthorDate: Sun Feb 28 01:17:31 2021 +0100
Committer: Zdenek Kabelac <zkabelac(a)redhat.com>
CommitterDate: Tue Mar 2 22:54:40 2021 +0100
makefiles: fix man-generate rule
Symlink and compiled man-generate binary has to go to builddir.
---
tools/Makefile.in | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/tools/Makefile.in b/tools/Makefile.in
index dce85726b..c89c75fa5 100644
--- a/tools/Makefile.in
+++ b/tools/Makefile.in
@@ -128,13 +128,13 @@ lvm: $(OBJECTS) lvm.o $(LVMINTERNAL_LIBS)
DEFS_man-generator.o += -DMAN_PAGE_GENERATOR
-man-generator.c: command.c
+man-generator.c: $(srcdir)/command.c
@echo " [LN] $@"
- $(Q) $(LN_S) -f $< $@
+ $(Q) $(LN_S) -f $< $(@F)
man-generator: man-generator.o
@echo " [CC] $@"
- $(Q) $(CC) $(CFLAGS) -o $@ $<
+ $(Q) $(CC) $(CFLAGS) -o $@ $(<F)
lvm.static: $(OBJECTS) lvm-static.o $(LVMINTERNAL_LIBS)
@echo " [CC] $@"
3 years, 1 month
main - makefiles: avoid sorting by locales
by Zdenek Kabelac
Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=824230e1e27c285eff9...
Commit: 824230e1e27c285eff98cec7497ef9474ceb4ddd
Parent: 9d190d6b4678f42de3285f7291caeec2f4a91cdb
Author: Zdenek Kabelac <zkabelac(a)redhat.com>
AuthorDate: Thu Feb 25 21:18:05 2021 +0100
Committer: Zdenek Kabelac <zkabelac(a)redhat.com>
CommitterDate: Tue Mar 2 22:54:40 2021 +0100
makefiles: avoid sorting by locales
Localized sort for building source file is not wanted.
---
tools/Makefile.in | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tools/Makefile.in b/tools/Makefile.in
index b26bc64a6..dce85726b 100644
--- a/tools/Makefile.in
+++ b/tools/Makefile.in
@@ -182,7 +182,7 @@ cmds.h: $(srcdir)/command-lines.in Makefile
( cat $(top_srcdir)/tools/license.inc && \
echo "/* Do not edit. This file is generated by the Makefile. */" && \
echo "cmd(CMD_NONE, none)" && \
- $(GREP) '^ID:' $(srcdir)/command-lines.in | $(SORT) -u | $(AWK) '{print "cmd(" $$2 "_CMD, " $$2 ")"}' && \
+ $(GREP) '^ID:' $(srcdir)/command-lines.in | LANG=C $(SORT) -u | $(AWK) '{print "cmd(" $$2 "_CMD, " $$2 ")"}' && \
echo "cmd(CMD_COUNT, count)" \
) > $@
3 years, 1 month
main - makefiles: support help target
by Zdenek Kabelac
Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=9d190d6b4678f42de32...
Commit: 9d190d6b4678f42de3285f7291caeec2f4a91cdb
Parent: 8d3ce32880da0dc0e0d3b6b397cc3bddaf901dee
Author: Zdenek Kabelac <zkabelac(a)redhat.com>
AuthorDate: Thu Feb 25 17:40:53 2021 +0100
Committer: Zdenek Kabelac <zkabelac(a)redhat.com>
CommitterDate: Tue Mar 2 22:54:40 2021 +0100
makefiles: support help target
Usable targets for top-level make.
---
Makefile.in | 25 +++++++++++++++++++++++++
1 file changed, 25 insertions(+)
diff --git a/Makefile.in b/Makefile.in
index a5eb00442..095f1f447 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -154,6 +154,31 @@ install_all_man:
install_tmpfiles_configuration:
$(MAKE) -C scripts install_tmpfiles_configuration
+help:
+ @echo -e "\nAvailable targets:"
+ @echo " all Default target."
+ @echo " all_man Build all man pages with generators."
+ @echo " clean Remove all compile files."
+ @echo " device-mapper Device mapper part of lvm2."
+ @echo " dist Generate distributable file."
+ @echo " distclean Remove all build files."
+ @echo " generate Generate man pages for sources."
+ @echo " help Display callable targets."
+ @echo " install Install all files."
+ @echo " install_all_man Install all man pages."
+ @echo " install_cluster Install cmirrord."
+ @echo " install_device-mapper Install device mapper files."
+ @echo " install_initscripts Install initialization scripts."
+ @echo " install_lvm2 Install lvm2 files."
+ @echo " install_systemd_units Install systemd units."
+ @echo " lcov Generate lcov output."
+ @echo " lcov-dated Generate lcov with timedate suffix."
+ @echo " lcov-reset Reset lcov counters"
+ @echo " man Build man pages."
+ @echo " rpm Build rpm."
+ @echo " run-unit-test Run unit tests."
+ @echo " tags Generate c/etags."
+
ifneq ("$(LCOV)", "")
.PHONY: lcov-reset lcov lcov-dated
3 years, 1 month
main - tests: make test complaint to local dev dir
by Zdenek Kabelac
Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=8d3ce32880da0dc0e0d...
Commit: 8d3ce32880da0dc0e0d3b6b397cc3bddaf901dee
Parent: 7528a3363071b201c1f71a15e40cb9855ae169cf
Author: Zdenek Kabelac <zkabelac(a)redhat.com>
AuthorDate: Wed Feb 24 11:54:24 2021 +0100
Committer: Zdenek Kabelac <zkabelac(a)redhat.com>
CommitterDate: Tue Mar 2 22:24:51 2021 +0100
tests: make test complaint to local dev dir
For test running in 'local' dev dir we want to see loop devices there.
Also add missing notification to lvmetad after wipefs.
---
test/shell/allow-mixed-block-sizes.sh | 60 +++++++++++++++++++++--------------
1 file changed, 36 insertions(+), 24 deletions(-)
diff --git a/test/shell/allow-mixed-block-sizes.sh b/test/shell/allow-mixed-block-sizes.sh
index b51232a84..efab1302a 100644
--- a/test/shell/allow-mixed-block-sizes.sh
+++ b/test/shell/allow-mixed-block-sizes.sh
@@ -1,6 +1,6 @@
#!/usr/bin/env bash
-# Copyright (C) 2019 Red Hat, Inc. All rights reserved.
+# Copyright (C) 2019-2021 Red Hat, Inc. All rights reserved.
#
# This copyrighted material is made available to anyone wishing to use,
# modify, copy, or redistribute it subject to the terms and conditions
@@ -15,32 +15,44 @@ SKIP_WITH_LVMPOLLD=1
. lib/inittest
losetup -h | grep sector-size || skip
+which fallocate || skip
+which wipefs || skip
-dd if=/dev/zero of=loopa bs=$((1024*1024)) count=2 2> /dev/null
-dd if=/dev/zero of=loopb bs=$((1024*1024)) count=2 2> /dev/null
+fallocate -l 2M loopa
+fallocate -l 2M loopb
LOOP1=$(losetup -f loopa --sector-size 4096 --show)
LOOP2=$(losetup -f loopb --show)
-echo $LOOP1
-echo $LOOP2
-
-aux extend_filter "a|$LOOP1|"
-aux extend_filter "a|$LOOP2|"
-
-not vgcreate --config 'devices {allow_mixed_block_sizes=0 scan="/dev"}' $vg $LOOP1 $LOOP2
-vgcreate --config 'devices {allow_mixed_block_sizes=1 scan="/dev"}' $vg $LOOP1 $LOOP2
-vgs --config 'devices {allow_mixed_block_sizes=1 scan="/dev"}' $vg
-
-aux wipefs_a $LOOP1
-aux wipefs_a $LOOP2
-
-vgcreate --config 'devices {allow_mixed_block_sizes=1 scan="/dev"}' $vg $LOOP1
-vgs --config 'devices {allow_mixed_block_sizes=1 scan="/dev"}' $vg
-not vgextend --config 'devices {allow_mixed_block_sizes=0 scan="/dev"}' $vg $LOOP2
-vgextend --config 'devices {allow_mixed_block_sizes=1 scan="/dev"}' $vg $LOOP2
-
-losetup -d $LOOP1
-losetup -d $LOOP2
+# prepare devX mapping so it works for real & fake dev dir
+d=1
+for i in "$LOOP1" "$LOOP2"; do
+ echo "$i"
+ m=${i##*loop}
+ test -e "$DM_DEV_DIR/loop$m" || mknod "$DM_DEV_DIR/loop$m" b 7 "$m"
+ eval "dev$d=\"$DM_DEV_DIR/loop$m\""
+ d=$(( d + 1 ))
+done
+
+aux extend_filter "a|$dev1|" "a|$dev2|"
+
+not vgcreate --config 'devices/allow_mixed_block_sizes=0' $vg "$dev1" "$dev2"
+vgcreate --config 'devices/allow_mixed_block_sizes=1' $vg "$dev1" "$dev2"
+vgs --config 'devices/allow_mixed_block_sizes=1' $vg
+
+for i in "$dev1" "$dev2" ; do
+ wipefs -a "$i"
+ # FIXME - we are not missing notification for hinting
+ # likely in more places - as the test should be able to work without
+ # system's udev working only on real /dev dir.
+ # aux notify_lvmetad "$i"
+done
+
+vgcreate --config 'devices/allow_mixed_block_sizes=1' $vg "$dev1"
+vgs --config 'devices/allow_mixed_block_sizes=1' $vg
+not vgextend --config 'devices/allow_mixed_block_sizes=0' $vg "$dev2"
+vgextend --config 'devices/allow_mixed_block_sizes=1' $vg "$dev2"
+
+losetup -d "$LOOP1"
+losetup -d "$LOOP2"
rm loopa
rm loopb
-
3 years, 1 month
main - tests: update setting LVM_BINARY for testing
by Zdenek Kabelac
Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=7528a3363071b201c1f...
Commit: 7528a3363071b201c1f71a15e40cb9855ae169cf
Parent: 3bab1a10264bf0d546cb5f0948ca382c9c882910
Author: Zdenek Kabelac <zkabelac(a)redhat.com>
AuthorDate: Tue Feb 23 16:27:44 2021 +0100
Committer: Zdenek Kabelac <zkabelac(a)redhat.com>
CommitterDate: Tue Mar 2 22:24:51 2021 +0100
tests: update setting LVM_BINARY for testing
When testing is running on uninstealled system - prefer our own binary
in tests.
---
test/lib/aux.sh | 2 +-
test/lib/utils.sh | 3 ++-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/test/lib/aux.sh b/test/lib/aux.sh
index c53d07b9e..1500e1f6a 100644
--- a/test/lib/aux.sh
+++ b/test/lib/aux.sh
@@ -177,7 +177,7 @@ prepare_clvmd() {
echo "<======== Starting CLVMD ========>"
echo -n "## preparing clvmd..."
# lvs is executed from clvmd - use our version
- LVM_LOG_FILE_EPOCH=CLVMD LVM_LOG_FILE_MAX_LINES=1000000 LVM_BINARY=$(which lvm) $run_valgrind clvmd -Isinglenode -d 1 -f &
+ LVM_LOG_FILE_EPOCH=CLVMD LVM_LOG_FILE_MAX_LINES=1000000 $run_valgrind clvmd -Isinglenode -d 1 -f &
echo $! > LOCAL_CLVMD
for i in {200..0} ; do
diff --git a/test/lib/utils.sh b/test/lib/utils.sh
index 175d1564a..9da9a966e 100644
--- a/test/lib/utils.sh
+++ b/test/lib/utils.sh
@@ -296,10 +296,11 @@ if test -z "${installed_testsuite+varset}"; then
*"$abs_top_builddir/test/lib"*) ;;
*)
PATH="$abs_top_builddir/test/lib:$abs_top_builddir/test/api:$PATH"
+ LVM_BINARY=$(which lvm)
LD_LIBRARY_PATH=$(find -L "$abs_top_builddir/libdm/" "$abs_top_builddir/tools/"\
"$abs_top_builddir/daemons/" \
-name "*.so" -printf "%h:")"$LD_LIBRARY_PATH"
- export PATH LD_LIBRARY_PATH ;;
+ export PATH LD_LIBRARY_PATH LVM_BINARY ;;
esac
fi
3 years, 1 month
main - config: remove redundant comment for deprecated settings
by David Teigland
Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=3bab1a10264bf0d546c...
Commit: 3bab1a10264bf0d546cb5f0948ca382c9c882910
Parent: db4af67b37b224171d9b2fed21f144a5e8a82496
Author: David Teigland <teigland(a)redhat.com>
AuthorDate: Tue Mar 2 14:11:38 2021 -0600
Committer: David Teigland <teigland(a)redhat.com>
CommitterDate: Tue Mar 2 14:15:17 2021 -0600
config: remove redundant comment for deprecated settings
Drop the comment "This setting is no longer used." which
was printed just before the standard deprecation comment:
"This configuration option is deprecated."
---
lib/config/config_settings.h | 32 ++++++++++++++++----------------
1 file changed, 16 insertions(+), 16 deletions(-)
diff --git a/lib/config/config_settings.h b/lib/config/config_settings.h
index ee5d97721..f04b435fb 100644
--- a/lib/config/config_settings.h
+++ b/lib/config/config_settings.h
@@ -352,16 +352,16 @@ cfg_array(devices_global_filter_CFG, "global_filter", devices_CFG_SECTION, CFG_D
"global_filter are not opened by LVM.\n")
cfg_runtime(devices_cache_CFG, "cache", devices_CFG_SECTION, 0, CFG_TYPE_STRING, vsn(1, 0, 0), vsn(1, 2, 19), NULL,
- "This setting is no longer used.\n")
+ NULL)
cfg_runtime(devices_cache_dir_CFG, "cache_dir", devices_CFG_SECTION, 0, CFG_TYPE_STRING, vsn(1, 2, 19), vsn(2, 3, 0), NULL,
- "This setting is no longer used.\n")
+ NULL)
cfg(devices_cache_file_prefix_CFG, "cache_file_prefix", devices_CFG_SECTION, CFG_ALLOW_EMPTY, CFG_TYPE_STRING, DEFAULT_CACHE_FILE_PREFIX, vsn(1, 2, 19), NULL, vsn(2, 3, 0), NULL,
- "This setting is no longer used.\n")
+ NULL)
cfg(devices_write_cache_state_CFG, "write_cache_state", devices_CFG_SECTION, 0, CFG_TYPE_BOOL, 1, vsn(1, 0, 0), NULL, vsn(2, 3, 0), NULL,
- "This setting is no longer used.\n")
+ NULL)
cfg_array(devices_types_CFG, "types", devices_CFG_SECTION, CFG_DEFAULT_UNDEFINED | CFG_ADVANCED, CFG_TYPE_INT | CFG_TYPE_STRING, NULL, vsn(1, 0, 0), NULL, 0, NULL,
"List of additional acceptable block device types.\n"
@@ -493,7 +493,7 @@ cfg(devices_ignore_lvm_mirrors_CFG, "ignore_lvm_mirrors", devices_CFG_SECTION, 0
"different way, making them a better choice for VG stacking.\n")
cfg(devices_disable_after_error_count_CFG, "disable_after_error_count", devices_CFG_SECTION, 0, CFG_TYPE_INT, 0, vsn(2, 2, 75), NULL, vsn(2, 3, 0), NULL,
- "This setting is no longer used.\n")
+ NULL)
cfg(devices_require_restorefile_with_uuid_CFG, "require_restorefile_with_uuid", devices_CFG_SECTION, 0, CFG_TYPE_BOOL, DEFAULT_REQUIRE_RESTOREFILE_WITH_UUID, vsn(2, 2, 73), NULL, 0, NULL,
"Allow use of pvcreate --uuid without requiring --restorefile.\n")
@@ -974,13 +974,13 @@ cfg(global_activation_CFG, "activation", global_CFG_SECTION, 0, CFG_TYPE_BOOL, D
"the error messages.\n")
cfg(global_fallback_to_lvm1_CFG, "fallback_to_lvm1", global_CFG_SECTION, CFG_DEFAULT_COMMENTED, CFG_TYPE_BOOL, 0, vsn(1, 0, 18), NULL, vsn(2, 3, 0), NULL,
- "This setting is no longer used.\n")
+ NULL)
cfg(global_format_CFG, "format", global_CFG_SECTION, CFG_DEFAULT_COMMENTED, CFG_TYPE_STRING, DEFAULT_FORMAT, vsn(1, 0, 0), NULL, vsn(2, 3, 0), NULL,
- "This setting is no longer used.\n")
+ NULL)
cfg_array(global_format_libraries_CFG, "format_libraries", global_CFG_SECTION, CFG_DEFAULT_UNDEFINED, CFG_TYPE_STRING, NULL, vsn(1, 0, 0), NULL, vsn(2, 3, 0), NULL,
- "This setting is no longer used.")
+ NULL)
cfg_array(global_segment_libraries_CFG, "segment_libraries", global_CFG_SECTION, CFG_DEFAULT_UNDEFINED, CFG_TYPE_STRING, NULL, vsn(1, 0, 18), NULL, vsn(2, 3, 3), NULL, NULL)
@@ -991,16 +991,16 @@ cfg(global_etc_CFG, "etc", global_CFG_SECTION, 0, CFG_TYPE_STRING, DEFAULT_ETC_D
"Location of /etc system configuration directory.\n")
cfg(global_locking_type_CFG, "locking_type", global_CFG_SECTION, 0, CFG_TYPE_INT, 1, vsn(1, 0, 0), NULL, vsn(2, 3, 0), NULL,
- "This setting is no longer used.")
+ NULL)
cfg(global_wait_for_locks_CFG, "wait_for_locks", global_CFG_SECTION, 0, CFG_TYPE_BOOL, DEFAULT_WAIT_FOR_LOCKS, vsn(2, 2, 50), NULL, 0, NULL,
"When disabled, fail if a lock request would block.\n")
cfg(global_fallback_to_clustered_locking_CFG, "fallback_to_clustered_locking", global_CFG_SECTION, 0, CFG_TYPE_BOOL, DEFAULT_FALLBACK_TO_CLUSTERED_LOCKING, vsn(2, 2, 42), NULL, vsn(2, 3, 0), NULL,
- "This setting is no longer used.\n")
+ NULL)
cfg(global_fallback_to_local_locking_CFG, "fallback_to_local_locking", global_CFG_SECTION, 0, CFG_TYPE_BOOL, DEFAULT_FALLBACK_TO_LOCAL_LOCKING, vsn(2, 2, 42), NULL, vsn(2, 3, 0), NULL,
- "This setting is no longer used.\n")
+ NULL)
cfg(global_locking_dir_CFG, "locking_dir", global_CFG_SECTION, 0, CFG_TYPE_STRING, DEFAULT_LOCK_DIR, vsn(1, 0, 0), "@DEFAULT_LOCK_DIR@", 0, NULL,
"Directory to use for LVM command file locks.\n"
@@ -1019,7 +1019,7 @@ cfg(global_library_dir_CFG, "library_dir", global_CFG_SECTION, CFG_DEFAULT_UNDEF
"Search this directory first for shared libraries.\n")
cfg(global_locking_library_CFG, "locking_library", global_CFG_SECTION, CFG_ALLOW_EMPTY | CFG_DEFAULT_COMMENTED, CFG_TYPE_STRING, DEFAULT_LOCKING_LIB, vsn(1, 0, 0), NULL, vsn(2, 3, 0), NULL,
- "This setting is no longer used.\n")
+ NULL)
cfg(global_abort_on_internal_errors_CFG, "abort_on_internal_errors", global_CFG_SECTION, 0, CFG_TYPE_BOOL, DEFAULT_ABORT_ON_INTERNAL_ERRORS, vsn(2, 2, 57), NULL, 0, NULL,
"Abort a command that encounters an internal error.\n"
@@ -1027,7 +1027,7 @@ cfg(global_abort_on_internal_errors_CFG, "abort_on_internal_errors", global_CFG_
"encountered the internal error. Please only enable for debugging.\n")
cfg(global_detect_internal_vg_cache_corruption_CFG, "detect_internal_vg_cache_corruption", global_CFG_SECTION, 0, CFG_TYPE_BOOL, 0, vsn(2, 2, 96), NULL, vsn(2, 2, 174), NULL,
- "No longer used.\n")
+ NULL)
cfg(global_metadata_read_only_CFG, "metadata_read_only", global_CFG_SECTION, 0, CFG_TYPE_BOOL, DEFAULT_METADATA_READ_ONLY, vsn(2, 2, 75), NULL, 0, NULL,
"No operations that change on-disk metadata are permitted.\n"
@@ -1125,10 +1125,10 @@ cfg(global_event_activation_CFG, "event_activation", global_CFG_SECTION, CFG_DEF
"a direct activation command to activate LVs in complete VGs.\n")
cfg(global_use_lvmetad_CFG, "use_lvmetad", global_CFG_SECTION, 0, CFG_TYPE_BOOL, 0, vsn(2, 2, 93), 0, vsn(2, 3, 0), NULL,
- "This setting is no longer used.\n")
+ NULL)
cfg(global_lvmetad_update_wait_time_CFG, "lvmetad_update_wait_time", global_CFG_SECTION, CFG_DEFAULT_COMMENTED, CFG_TYPE_INT, 0, vsn(2, 2, 151), NULL, vsn(2, 3, 0), NULL,
- "This setting is no longer used.\n")
+ NULL)
cfg(global_use_aio_CFG, "use_aio", global_CFG_SECTION, CFG_DEFAULT_COMMENTED, CFG_TYPE_BOOL, DEFAULT_USE_AIO, vsn(2, 2, 183), NULL, 0, NULL,
"Use async I/O when reading and writing devices.\n")
@@ -1764,7 +1764,7 @@ cfg(metadata_pvmetadataignore_CFG, "pvmetadataignore", metadata_CFG_SECTION, CFG
cfg(metadata_stripesize_CFG, "stripesize", metadata_CFG_SECTION, CFG_ADVANCED | CFG_DEFAULT_COMMENTED, CFG_TYPE_INT, DEFAULT_STRIPESIZE, vsn(1, 0, 0), NULL, 0, NULL, NULL)
cfg_array(metadata_dirs_CFG, "dirs", metadata_CFG_SECTION, CFG_ADVANCED | CFG_DEFAULT_UNDEFINED, CFG_TYPE_STRING, NULL, vsn(1, 0, 0), NULL, vsn(2, 3, 0), NULL,
- "This setting is no longer used.\n")
+ NULL)
cfg_section(metadata_disk_areas_CFG_SUBSECTION, "disk_areas", metadata_CFG_SECTION, CFG_UNSUPPORTED | CFG_DEFAULT_COMMENTED, vsn(1, 0, 0), vsn(2, 3, 0), NULL, NULL)
cfg_section(disk_area_CFG_SUBSECTION, "disk_area", metadata_disk_areas_CFG_SUBSECTION, CFG_NAME_VARIABLE | CFG_UNSUPPORTED | CFG_DEFAULT_COMMENTED, vsn(1, 0, 0), vsn(2, 3, 0), NULL, NULL)
3 years, 1 month
main - lvmconfig: fix deprecation message
by David Teigland
Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=db4af67b37b224171d9...
Commit: db4af67b37b224171d9b2fed21f144a5e8a82496
Parent: aa34da6eccb4dafe0a35129ddfb8ad7fb63fb7d2
Author: David Teigland <teigland(a)redhat.com>
AuthorDate: Tue Mar 2 13:49:41 2021 -0600
Committer: David Teigland <teigland(a)redhat.com>
CommitterDate: Tue Mar 2 14:14:28 2021 -0600
lvmconfig: fix deprecation message
When lvmconfig --typeconfig full printed a deprecated
entry it would attempt to print a non-existing
deprecation comment resulting in output like:
# (null) # This setting is no longer used.
---
lib/config/config.c | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/lib/config/config.c b/lib/config/config.c
index 96f2ad58d..9725dece3 100644
--- a/lib/config/config.c
+++ b/lib/config/config.c
@@ -1708,6 +1708,7 @@ static int _out_prefix_fn(const struct dm_config_node *cn, const char *line, voi
const char *node_type_name = cn->v ? "option" : "section";
char path[CFG_PATH_MAX_LEN];
char commentline[MAX_COMMENT_LINE+1];
+ int is_deprecated = 0;
if (cn->id <= 0)
return 1;
@@ -1721,13 +1722,14 @@ static int _out_prefix_fn(const struct dm_config_node *cn, const char *line, voi
cfg_def = cfg_def_get_item_p(cn->id);
+ is_deprecated = _def_node_is_deprecated(cfg_def, out->tree_spec);
+
if (out->tree_spec->withsummary || out->tree_spec->withcomments) {
_cfg_def_make_path(path, sizeof(path), cfg_def->id, cfg_def, 1);
fprintf(out->fp, "\n");
fprintf(out->fp, "%s# Configuration %s %s.\n", line, node_type_name, path);
- if (out->tree_spec->withcomments &&
- _def_node_is_deprecated(cfg_def, out->tree_spec))
+ if (out->tree_spec->withcomments && is_deprecated && cfg_def->deprecation_comment)
fprintf(out->fp, "%s# %s", line, cfg_def->deprecation_comment);
if (cfg_def->comment) {
@@ -1745,7 +1747,7 @@ static int _out_prefix_fn(const struct dm_config_node *cn, const char *line, voi
}
}
- if (_def_node_is_deprecated(cfg_def, out->tree_spec))
+ if (is_deprecated)
fprintf(out->fp, "%s# This configuration %s is deprecated.\n", line, node_type_name);
if (cfg_def->flags & CFG_ADVANCED)
@@ -1773,7 +1775,7 @@ static int _out_prefix_fn(const struct dm_config_node *cn, const char *line, voi
return_0;
fprintf(out->fp, "%s# Available since version %s.\n", line, version);
- if (_def_node_is_deprecated(cfg_def, out->tree_spec)) {
+ if (is_deprecated) {
if (!_get_config_node_version(cfg_def->deprecated_since_version, version))
return_0;
fprintf(out->fp, "%s# Deprecated since version %s.\n", line, version);
3 years, 1 month