main - makefiles: update doc
by Zdenek Kabelac
Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=31076942f10bdd2ef44...
Commit: 31076942f10bdd2ef449697c1a315372b71ee8c1
Parent: 4791a4fc68c681a45bcdc5660c6e96af607fab27
Author: Zdenek Kabelac <zkabelac(a)redhat.com>
AuthorDate: Sat Feb 11 16:10:19 2023 +0100
Committer: Zdenek Kabelac <zkabelac(a)redhat.com>
CommitterDate: Mon Feb 13 13:41:59 2023 +0100
makefiles: update doc
Document using of target useful for checking variable content.
---
Makefile.in | 1 +
1 file changed, 1 insertion(+)
diff --git a/Makefile.in b/Makefile.in
index 1d5aff482..58f255d4d 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -171,6 +171,7 @@ help:
@echo " lcov-dated Generate lcov with timedate suffix."
@echo " lcov-reset Reset lcov counters"
@echo " man Build man pages."
+ @echo " print-VARIABLE Resolve make variable."
@echo " rpm Build rpm."
@echo " run-unit-test Run unit tests."
@echo " tags Generate c/etags."
1 year, 2 months
main - makefiles: allow using configure cppflags
by Zdenek Kabelac
Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=4791a4fc68c681a45bc...
Commit: 4791a4fc68c681a45bcdc5660c6e96af607fab27
Parent: 50f73de4b27c11c810c8f7aea3e36a5c947408af
Author: Zdenek Kabelac <zkabelac(a)redhat.com>
AuthorDate: Sun Feb 12 13:12:23 2023 +0100
Committer: Zdenek Kabelac <zkabelac(a)redhat.com>
CommitterDate: Mon Feb 13 13:41:59 2023 +0100
makefiles: allow using configure cppflags
Configure defines 'CPPFLAGS' and we should use defined value
for compilation.
Reported-by: debian
---
libdm/make.tmpl.in | 5 +++--
make.tmpl.in | 5 +++--
tools/Makefile.in | 2 +-
3 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/libdm/make.tmpl.in b/libdm/make.tmpl.in
index 92dc715d2..fb8973b6b 100644
--- a/libdm/make.tmpl.in
+++ b/libdm/make.tmpl.in
@@ -59,6 +59,7 @@ DEFS += @DEFS@
# FIXME set this only where it's needed, not globally?
CFLAGS ?= @COPTIMISE_FLAG@ @CFLAGS@
LDFLAGS ?= @LDFLAGS@
+CPPFLAGS ?= @CPPFLAGS@
CLDFLAGS += @CLDFLAGS@
ELDFLAGS += @ELDFLAGS@
LDDEPS += @LDDEPS@
@@ -412,7 +413,7 @@ DEFS+=-D_FILE_OFFSET_BITS=64
%.o: %.c $(DEPS)
@echo " [CC] $(<F)"
@mkdir -p $(@D)
- $(Q) $(CC) $(DEPFLAGS) -c $(INCLUDES) $(VALGRIND_CFLAGS) $(PROGS_CFLAGS) $(DEFS) $(DEFS_$@) $(WFLAGS) $(WCFLAGS) $(CFLAGS) $(CFLAGS_$@) $< -o $@
+ $(Q) $(CC) $(DEPFLAGS) -c $(INCLUDES) $(VALGRIND_CFLAGS) $(PROGS_CFLAGS) $(DEFS) $(DEFS_$@) $(WFLAGS) $(WCFLAGS) $(CFLAGS) $(CFLAGS_$@) $(CPPFLAGS) $< -o $@
%.o: %.cpp $(DEPS)
@echo " [CXX] $(<F)"
@@ -422,7 +423,7 @@ DEFS+=-D_FILE_OFFSET_BITS=64
%.pot: %.c $(DEPS)
@echo " [CC] $@"
@mkdir -p $(@D)
- $(Q) $(CC) -E $(INCLUDES) $(VALGRIND_CFLAGS) $(PROGS_CFLAGS) -include $(top_builddir)/po/pogen.h $(DEFS) $(WFLAGS) $(CFLAGS) $< >$@
+ $(Q) $(CC) -E $(INCLUDES) $(VALGRIND_CFLAGS) $(PROGS_CFLAGS) -include $(top_builddir)/po/pogen.h $(DEFS) $(WFLAGS) $(CFLAGS) $(CPPFLAGS) $< >$@
%.so: %.o
@echo " [CC] $(<F)"
diff --git a/make.tmpl.in b/make.tmpl.in
index 222ed671a..9f4ecc33f 100644
--- a/make.tmpl.in
+++ b/make.tmpl.in
@@ -63,6 +63,7 @@ STATIC_LIBS = $(PTHREAD_LIBS)
DEFS += @DEFS@
# FIXME set this only where it's needed, not globally?
CFLAGS ?= @COPTIMISE_FLAG@ @CFLAGS@
+CPPFLAGS ?= @CPPFLAGS@
LDFLAGS ?= @LDFLAGS@
CLDFLAGS += @CLDFLAGS@
ELDFLAGS += @ELDFLAGS@
@@ -477,7 +478,7 @@ DEFS+=-D_FILE_OFFSET_BITS=64
%.o: %.c $(DEPS)
@echo " [CC] $(<F)"
@mkdir -p $(@D)
- $(Q) $(CC) $(DEPFLAGS) -c $(INCLUDES) $(VALGRIND_CFLAGS) $(PROGS_CFLAGS) $(DEFS) $(DEFS_$@) $(WFLAGS) $(WCFLAGS) $(CFLAGS) $(CFLAGS_$@) $< -o $@
+ $(Q) $(CC) $(DEPFLAGS) -c $(INCLUDES) $(VALGRIND_CFLAGS) $(PROGS_CFLAGS) $(DEFS) $(DEFS_$@) $(WFLAGS) $(WCFLAGS) $(CFLAGS) $(CFLAGS_$@) $(CPPFLAGS) $< -o $@
%.o: %.cpp $(DEPS)
@echo " [CXX] $(<F)"
@@ -487,7 +488,7 @@ DEFS+=-D_FILE_OFFSET_BITS=64
%.pot: %.c $(DEPS)
@echo " [CC] $(<F)"
@mkdir -p $(@D)
- $(Q) $(CC) -E $(INCLUDES) $(VALGRIND_CFLAGS) $(PROGS_CFLAGS) -include $(top_builddir)/po/pogen.h $(DEFS) $(WFLAGS) $(CFLAGS) $< >$@
+ $(Q) $(CC) -E $(INCLUDES) $(VALGRIND_CFLAGS) $(PROGS_CFLAGS) -include $(top_builddir)/po/pogen.h $(DEFS) $(WFLAGS) $(CFLAGS) $(CPPFLAGS) $< >$@
%.so: %.o
@echo " [CC] $(<F)"
diff --git a/tools/Makefile.in b/tools/Makefile.in
index 2a663a5b6..545b94f23 100644
--- a/tools/Makefile.in
+++ b/tools/Makefile.in
@@ -133,7 +133,7 @@ man-generator.c: $(srcdir)/command.c
man-generator: man-generator.o
@echo " [CC] $@"
- $(Q) $(CC) $(CFLAGS) -o $@ $(<F)
+ $(Q) $(CC) $(CFLAGS) $(CPPFLAGS) -o $@ $(<F)
lvm.static: $(OBJECTS) lvm-static.o $(LVMINTERNAL_LIBS)
@echo " [CC] $@"
1 year, 2 months
main - makefiles: use configured systemd library paths
by Zdenek Kabelac
Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=50f73de4b27c11c810c...
Commit: 50f73de4b27c11c810c8f7aea3e36a5c947408af
Parent: 0fc2d418f76a9e98ab988ff5a3440a3beef5295f
Author: Zdenek Kabelac <zkabelac(a)redhat.com>
AuthorDate: Sat Feb 11 16:06:26 2023 +0100
Committer: Zdenek Kabelac <zkabelac(a)redhat.com>
CommitterDate: Mon Feb 13 13:41:59 2023 +0100
makefiles: use configured systemd library paths
Use discovered/selected systemd library from configure.
---
daemons/lvmlockd/Makefile.in | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/daemons/lvmlockd/Makefile.in b/daemons/lvmlockd/Makefile.in
index 91beb1ad8..e5ba82517 100644
--- a/daemons/lvmlockd/Makefile.in
+++ b/daemons/lvmlockd/Makefile.in
@@ -52,8 +52,8 @@ LDFLAGS += -L$(top_builddir)/libdaemon/server $(EXTRA_EXEC_LDFLAGS) $(ELDFLAGS)
LIBS += $(DAEMON_LIBS) $(PTHREAD_LIBS)
ifeq ($(USE_SD_NOTIFY),yes)
- CFLAGS += $(shell pkg-config --cflags libsystemd) -DUSE_SD_NOTIFY
- LIBS += $(shell pkg-config --libs libsystemd)
+ CFLAGS += $(SYSTEMD_CFLAGS) -DUSE_SD_NOTIFY
+ LIBS += $(SYSTEMD_LIBS)
endif
lvmlockd: $(OBJECTS) $(top_builddir)/libdaemon/server/libdaemonserver.a $(INTERNAL_LIBS)
1 year, 2 months
main - WHATS_NEW_DM: update
by Zdenek Kabelac
Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=0fc2d418f76a9e98ab9...
Commit: 0fc2d418f76a9e98ab988ff5a3440a3beef5295f
Parent: 9b78f7eee9f231d88ed5ca05fbf6da8c473ab41e
Author: Zdenek Kabelac <zkabelac(a)redhat.com>
AuthorDate: Sun Feb 12 23:50:09 2023 +0100
Committer: Zdenek Kabelac <zkabelac(a)redhat.com>
CommitterDate: Mon Feb 13 13:41:59 2023 +0100
WHATS_NEW_DM: update
---
WHATS_NEW_DM | 1 +
1 file changed, 1 insertion(+)
diff --git a/WHATS_NEW_DM b/WHATS_NEW_DM
index 020efe6f4..1f94e5e27 100644
--- a/WHATS_NEW_DM
+++ b/WHATS_NEW_DM
@@ -1,5 +1,6 @@
Version 1.02.191 -
=====================================
+ Improve parallel creation of /dev/mapper/control device node.
Import previous ID_FS_* udev records in 13-dm-disk.rules for suspended DM dev.
Remove NAME="mapper/control" rule from 10-dm.rules to avoid udev warnings.
1 year, 2 months
main - libdm: match reactivation of sibling for snapshot
by Zdenek Kabelac
Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=9b78f7eee9f231d88ed...
Commit: 9b78f7eee9f231d88ed5ca05fbf6da8c473ab41e
Parent: 7e14835a46a6c9e66087d6502d23df53c2a9954f
Author: Zdenek Kabelac <zkabelac(a)redhat.com>
AuthorDate: Sun Feb 12 23:53:18 2023 +0100
Committer: Zdenek Kabelac <zkabelac(a)redhat.com>
CommitterDate: Mon Feb 13 13:41:59 2023 +0100
libdm: match reactivation of sibling for snapshot
Apply same code for libdm as in device_mapper dir from
commit c8a5948a71b041ae2cce03e1b3a9843f0fab023f.
---
libdm/libdm-deptree.c | 89 +++++++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 89 insertions(+)
diff --git a/libdm/libdm-deptree.c b/libdm/libdm-deptree.c
index 33a80cf4d..bb2e53669 100644
--- a/libdm/libdm-deptree.c
+++ b/libdm/libdm-deptree.c
@@ -254,6 +254,10 @@ struct load_properties {
unsigned send_messages;
/* Skip suspending node's children, used when sending messages to thin-pool */
int skip_suspend;
+
+ /* Suspend and Resume siblings after node activation with udev flags*/
+ unsigned reactivate_siblings;
+ uint16_t reactivate_udev_flags;
};
/* Two of these used to join two nodes with uses and used_by. */
@@ -1877,6 +1881,68 @@ static int _rename_conflict_exists(struct dm_tree_node *parent,
return 0;
}
+/*
+ * Reactivation of sibling nodes
+ *
+ * Function is used when activating origin and its thick snapshots
+ * to ensure udev is processing first the origin LV and all the
+ * snapshot LVs are processed afterwards.
+ */
+static int _reactivate_siblings(struct dm_tree_node *dnode,
+ const char *uuid_prefix,
+ size_t uuid_prefix_len)
+{
+ struct dm_tree_node *child;
+ const char *uuid;
+ void *handle = NULL;
+ int r = 1;
+
+ /* Wait for udev before reactivating siblings */
+ if (!dm_udev_wait(dm_tree_get_cookie(dnode)))
+ stack;
+
+ dm_tree_set_cookie(dnode, 0);
+
+ while ((child = dm_tree_next_child(&handle, dnode, 0))) {
+ if (child->props.reactivate_siblings) {
+ /* Skip 'leading' device in this group, marked with flag */
+ child->props.reactivate_siblings = 0;
+ continue;
+ }
+
+ if (!(uuid = dm_tree_node_get_uuid(child))) {
+ stack;
+ continue;
+ }
+
+ if (!_uuid_prefix_matches(uuid, uuid_prefix, uuid_prefix_len))
+ continue;
+
+ if (!_suspend_node(child->name, child->info.major, child->info.minor,
+ child->dtree->skip_lockfs,
+ child->dtree->no_flush, &child->info)) {
+ log_error("Unable to suspend %s (" FMTu32
+ ":" FMTu32 ")", child->name,
+ child->info.major, child->info.minor);
+ r = 0;
+ continue;
+ }
+ if (!_resume_node(child->name, child->info.major, child->info.minor,
+ child->props.read_ahead, child->props.read_ahead_flags,
+ &child->info, &child->dtree->cookie,
+ child->props.reactivate_udev_flags, // use these flags
+ child->info.suspended)) {
+ log_error("Failed to suspend %s (" FMTu32
+ ":" FMTu32 ")", child->name,
+ child->info.major, child->info.minor);
+ r = 0;
+ continue;
+ }
+ }
+
+ return r;
+}
+
int dm_tree_activate_children(struct dm_tree_node *dnode,
const char *uuid_prefix,
size_t uuid_prefix_len)
@@ -1965,6 +2031,11 @@ int dm_tree_activate_children(struct dm_tree_node *dnode,
if (r && (child->props.send_messages > 1) &&
!(r = _node_send_messages(child, uuid_prefix, uuid_prefix_len, 1)))
stack;
+
+ /* Reactivate only for fresh activated origin */
+ if (r && child->props.reactivate_siblings &&
+ (!(r = _reactivate_siblings(dnode, uuid_prefix, uuid_prefix_len))))
+ stack;
}
if (awaiting_peer_rename)
priority--; /* redo priority level */
@@ -2999,6 +3070,10 @@ int dm_tree_node_add_snapshot_origin_target(struct dm_tree_node *dnode,
/* Resume snapshot origins after new snapshots */
dnode->activation_priority = 1;
+ if (!dnode->info.exists)
+ /* Reactivate siblings for this origin after being resumed */
+ dnode->props.reactivate_siblings = 1;
+
/*
* Don't resume the origin immediately in case it is a non-trivial
* target that must not be active more than once concurrently!
@@ -3061,6 +3136,20 @@ static int _add_snapshot_target(struct dm_tree_node *node,
/* Resume merging snapshot after snapshot-merge */
seg->merge->activation_priority = 2;
}
+ } else if (!origin_node->info.exists) {
+ /* Keep original udev_flags for reactivation. */
+ node->props.reactivate_udev_flags = node->udev_flags;
+
+ /* Reactivation is needed if the origin's -real device is not in DM table.
+ * For this case after the resume of its origin LV we resume its snapshots
+ * with updated udev_flags to completely avoid udev scanning for the first resume.
+ * Reactivation then resumes snapshots with original udev_flags.
+ */
+ node->udev_flags |= DM_SUBSYSTEM_UDEV_FLAG0 |
+ DM_UDEV_DISABLE_DISK_RULES_FLAG |
+ DM_UDEV_DISABLE_OTHER_RULES_FLAG;
+ log_debug_activation("Using udev_flags 0x%x for activation of %s.",
+ node->udev_flags, node->name);
}
return 1;
1 year, 2 months
main - libdm: improve parallel create of control node
by Zdenek Kabelac
Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=7e14835a46a6c9e6608...
Commit: 7e14835a46a6c9e66087d6502d23df53c2a9954f
Parent: cf0dc9a13cf365859e7dad3bb1ad02040925ae11
Author: Zdenek Kabelac <zkabelac(a)redhat.com>
AuthorDate: Sun Feb 12 23:44:43 2023 +0100
Committer: Zdenek Kabelac <zkabelac(a)redhat.com>
CommitterDate: Mon Feb 13 13:41:59 2023 +0100
libdm: improve parallel create of control node
When two parallel commands would have tried to create our
/dev/mapper/control node at the same time, one of them could
actually fail even if the 2nd. command actually mknod()
this control node correctly.
So for EEXIST case add detection if the control node is ok.
This may possibly help with some race case in early boot.
---
device_mapper/ioctl/libdm-iface.c | 9 +++++++--
libdm/ioctl/libdm-iface.c | 9 +++++++--
2 files changed, 14 insertions(+), 4 deletions(-)
diff --git a/device_mapper/ioctl/libdm-iface.c b/device_mapper/ioctl/libdm-iface.c
index d25b07800..ffcbc8a48 100644
--- a/device_mapper/ioctl/libdm-iface.c
+++ b/device_mapper/ioctl/libdm-iface.c
@@ -312,8 +312,13 @@ static int _create_control(const char *control, uint32_t major, uint32_t minor)
old_umask = umask(DM_CONTROL_NODE_UMASK);
if (mknod(control, S_IFCHR | S_IRUSR | S_IWUSR,
MKDEV(major, minor)) < 0) {
- log_sys_error("mknod", control);
- ret = 0;
+ if (errno != EEXIST) {
+ log_sys_error("mknod", control);
+ ret = 0;
+ } else if (_control_exists(control, major, minor) != 1) {
+ stack; /* Invalid control node created by parallel command ? */
+ ret = 0;
+ }
}
umask(old_umask);
(void) dm_prepare_selinux_context(NULL, 0);
diff --git a/libdm/ioctl/libdm-iface.c b/libdm/ioctl/libdm-iface.c
index dfa91b866..2e2da8b99 100644
--- a/libdm/ioctl/libdm-iface.c
+++ b/libdm/ioctl/libdm-iface.c
@@ -311,8 +311,13 @@ static int _create_control(const char *control, uint32_t major, uint32_t minor)
old_umask = umask(DM_CONTROL_NODE_UMASK);
if (mknod(control, S_IFCHR | S_IRUSR | S_IWUSR,
MKDEV(major, minor)) < 0) {
- log_sys_error("mknod", control);
- ret = 0;
+ if (errno != EEXIST) {
+ log_sys_error("mknod", control);
+ ret = 0;
+ } else if (_control_exists(control, major, minor) != 1) {
+ stack; /* Invalid control node created by parallel command ? */
+ ret = 0;
+ }
}
umask(old_umask);
(void) dm_prepare_selinux_context(NULL, 0);
1 year, 2 months
main - filesystem: use PATH_MAX for linux paths
by Zdenek Kabelac
Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=cf0dc9a13cf365859e7...
Commit: cf0dc9a13cf365859e7dad3bb1ad02040925ae11
Parent: 615347da20f7ede98c3cc8b1fd0aaaae15603c6e
Author: Zdenek Kabelac <zkabelac(a)redhat.com>
AuthorDate: Sun Feb 12 19:23:12 2023 +0100
Committer: Zdenek Kabelac <zkabelac(a)redhat.com>
CommitterDate: Sun Feb 12 23:56:29 2023 +0100
filesystem: use PATH_MAX for linux paths
---
lib/device/filesystem.c | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/lib/device/filesystem.c b/lib/device/filesystem.c
index c9cc7c553..9b086d8c1 100644
--- a/lib/device/filesystem.c
+++ b/lib/device/filesystem.c
@@ -232,10 +232,10 @@ int fs_mount_state_is_misnamed(struct cmd_context *cmd, struct logical_volume *l
FILE *fp;
char proc_line[PATH_MAX];
char proc_fstype[FSTYPE_MAX];
- char proc_devpath[1024];
- char proc_mntpath[1024];
- char lv_mapper_path[1024];
- char mntent_mount_dir[1024];
+ char proc_devpath[PATH_MAX];
+ char proc_mntpath[PATH_MAX];
+ char lv_mapper_path[PATH_MAX];
+ char mntent_mount_dir[PATH_MAX];
char *dm_name;
struct stat st_lv;
struct stat stme;
@@ -275,14 +275,14 @@ int fs_mount_state_is_misnamed(struct cmd_context *cmd, struct logical_volume *l
continue;
if (stme.st_dev != st_lv.st_rdev)
continue;
- strncpy(mntent_mount_dir, me->mnt_dir, PATH_MAX-1);
+ dm_strncpy(mntent_mount_dir, me->mnt_dir, sizeof(mntent_mount_dir));
}
endmntent(fme);
if (!(dm_name = dm_build_dm_name(cmd->mem, lv->vg->name, lv->name, NULL)))
return_0;
- if ((dm_snprintf(lv_mapper_path, 1024, "%s/%s", dm_dir(), dm_name) < 0))
+ if ((dm_snprintf(lv_mapper_path, sizeof(lv_mapper_path), "%s/%s", dm_dir(), dm_name) < 0))
return_0;
if (!(fp = fopen("/proc/mounts", "r")))
1 year, 2 months
main - configure: update
by Zdenek Kabelac
Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=615347da20f7ede98c3...
Commit: 615347da20f7ede98c3cc8b1fd0aaaae15603c6e
Parent: 1416bb383719f5d4dde42a9bfb123e0a7c38a36c
Author: Zdenek Kabelac <zkabelac(a)redhat.com>
AuthorDate: Fri Feb 10 21:30:57 2023 +0100
Committer: Zdenek Kabelac <zkabelac(a)redhat.com>
CommitterDate: Fri Feb 10 22:31:43 2023 +0100
configure: update
---
configure | 26 ++++++++++++++++++++------
1 file changed, 20 insertions(+), 6 deletions(-)
diff --git a/configure b/configure
index e84333ec7..7b160639f 100755
--- a/configure
+++ b/configure
@@ -12933,6 +12933,19 @@ fi
# so lvresize can check detected flag here
#
DEFAULT_USE_BLKID_WIPING=0
+if test -n "$PKG_CONFIG" && \
+ { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"blkid >= 2.24\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "blkid >= 2.24") 2>&5
+ ac_status=$?
+ printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+ HAVE_BLKID="yes"
+else
+ HAVE_BLKID="no"
+fi
+
+if test "$HAVE_BLKID" = "yes"
+then :
pkg_failed=no
@@ -13024,10 +13037,9 @@ else
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
printf "%s\n" "yes" >&6; }
- HAVE_BLKID=1
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for blkdid.h defines BLKID_SUBLKS_FSINFO." >&5
-printf %s "checking for blkdid.h defines BLKID_SUBLKS_FSINFO.... " >&6; }
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for blkid.h defines BLKID_SUBLKS_FSINFO." >&5
+printf %s "checking for blkid.h defines BLKID_SUBLKS_FSINFO.... " >&6; }
if test ${ac_cv_have_blkid_sublks_fsinfo+y}
then :
printf %s "(cached) " >&6
@@ -13057,7 +13069,7 @@ fi
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_have_blkid_sublks_fsinfo" >&5
printf "%s\n" "$ac_cv_have_blkid_sublks_fsinfo" >&6; }
- if test $ac_cv_have_blkid_sublks_fsinfo = yes
+ if test $ac_cv_have_blkid_sublks_fsinfo = yes
then :
printf "%s\n" "#define HAVE_BLKID_SUBLKS_FSINFO 1" >>confdefs.h
@@ -13066,13 +13078,15 @@ fi
fi
+fi
+
if test "$BLKID_WIPING" != "no"
then :
- if test "$HAVE_BLKID" = 1
+ if test "$HAVE_BLKID" = "yes"
then :
- BLKID_WIPING=yes
+ BLKID_WIPING="yes"
BLKID_PC="blkid"
DEFAULT_USE_BLKID_WIPING=1
1 year, 2 months
main - configure.ac: check for blkid when required
by Zdenek Kabelac
Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=1416bb383719f5d4dde...
Commit: 1416bb383719f5d4dde42a9bfb123e0a7c38a36c
Parent: d1bfa400a18c0223dcc60379dcec8b05b2ef6d5c
Author: Zdenek Kabelac <zkabelac(a)redhat.com>
AuthorDate: Fri Feb 10 21:31:07 2023 +0100
Committer: Zdenek Kabelac <zkabelac(a)redhat.com>
CommitterDate: Fri Feb 10 22:29:33 2023 +0100
configure.ac: check for blkid when required
We still need to support build without any blkid present,
so use PKG_CHECK_EXISTS() instead of direct failure
from PKG_CHECK_MODULES for too old version.
---
configure.ac | 18 ++++++++++--------
1 file changed, 10 insertions(+), 8 deletions(-)
diff --git a/configure.ac b/configure.ac
index 3177012e2..1c4d5fd1f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1126,11 +1126,12 @@ AC_ARG_ENABLE(blkid_wiping,
# so lvresize can check detected flag here
#
DEFAULT_USE_BLKID_WIPING=0
+PKG_CHECK_EXISTS([blkid >= 2.24], [HAVE_BLKID="yes"], [HAVE_BLKID="no"])
-PKG_CHECK_MODULES([BLKID], [blkid >= 2.24], [
- HAVE_BLKID=1
+AS_IF([test "$HAVE_BLKID" = "yes"], [
+ PKG_CHECK_MODULES([BLKID], [blkid >= 2.24], [
- AC_CACHE_CHECK([for blkdid.h defines BLKID_SUBLKS_FSINFO.],
+ AC_CACHE_CHECK([for blkid.h defines BLKID_SUBLKS_FSINFO.],
[ac_cv_have_blkid_sublks_fsinfo],
[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([#include <blkid/blkid.h>
#ifndef BLKID_SUBLKS_FSINFO
@@ -1138,14 +1139,15 @@ PKG_CHECK_MODULES([BLKID], [blkid >= 2.24], [
#endif])],
[ac_cv_have_blkid_sublks_fsinfo="yes"], [ac_cv_have_blkid_sublks_fsinfo="no"])])
- AC_IF_YES(ac_cv_have_blkid_sublks_fsinfo,
- AC_DEFINE(HAVE_BLKID_SUBLKS_FSINFO, 1,
- [Define if blkid.h has BLKID_SUBLKS_FSINFO]))
+ AC_IF_YES(ac_cv_have_blkid_sublks_fsinfo,
+ AC_DEFINE(HAVE_BLKID_SUBLKS_FSINFO, 1,
+ [Define if blkid.h has BLKID_SUBLKS_FSINFO]))
+ ])
])
AS_IF([test "$BLKID_WIPING" != "no"], [
- AS_IF([test "$HAVE_BLKID" = 1], [
- BLKID_WIPING=yes
+ AS_IF([test "$HAVE_BLKID" = "yes"], [
+ BLKID_WIPING="yes"
BLKID_PC="blkid"
DEFAULT_USE_BLKID_WIPING=1
AC_DEFINE([BLKID_WIPING_SUPPORT], 1, [Define to 1 to use libblkid detection of signatures when wiping.])
1 year, 2 months
main - WHATS_NEW: update
by Zdenek Kabelac
Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=d1bfa400a18c0223dcc...
Commit: d1bfa400a18c0223dcc60379dcec8b05b2ef6d5c
Parent: 21edfc4a5ea11d888f506b41d36a0ec983dc63c9
Author: Zdenek Kabelac <zkabelac(a)redhat.com>
AuthorDate: Fri Feb 10 20:51:46 2023 +0100
Committer: Zdenek Kabelac <zkabelac(a)redhat.com>
CommitterDate: Fri Feb 10 20:54:05 2023 +0100
WHATS_NEW: update
---
WHATS_NEW | 2 ++
1 file changed, 2 insertions(+)
diff --git a/WHATS_NEW b/WHATS_NEW
index 1a0812df8..248e30f5c 100644
--- a/WHATS_NEW
+++ b/WHATS_NEW
@@ -1,5 +1,7 @@
version 2.03.19 -
====================================
+ Configure supports --with-systemd-run executed from udev rules.
+ Enhancement for build with MuslC systemd and non-bash system shells (dash).
Do not reset SYSTEMD_READY variable in udev for PVs on MD and loop devices.
Ensure udev is processing origin LV before its thick snapshots LVs.
Fix and improve runtime memory size detection for VDO volumes.
1 year, 2 months