mirror of
https://github.com/openwrt/packages.git
synced 2025-12-22 01:44:32 +04:00
f2b49654eb
LVM changes: Version 2.03.33 - 27th June 2025 ================================ Various spelling, grammar, formatting, test, and build script improvements. Override LC_NUMERIC locale if unsuitable for json_std report format. Repair raid arrays with transiently lost devices. Version 2.03.32 - 05th May 2025 =============================== Lvconvert vdopool conversion properly validates acceptable LVs. Accept thin pool data LV as cacheable LV. Allow using zram block devices (likely for testing). Fix lvresize when resizing COW snapshots already covering origin. Fix lvmdbusd read of executed lvm commands output. Fix construction of DM UUID for cachevol _cdata and _cmeta devices. Ignore PV claims from old metadata when then PV belongs to a new VG. Fix integrity metadata rounding. Accept --autobackup option in pvresize. libdm changes: Version 1.02.207 - 27th June 2025 ================================= Escape the escape character itself on JSON report format output. Fail dm_report_group_create if radix char from locale unsuitable for JSON_STD. Version 1.02.206 - 05th May 2025 ================================ Add support for using regex in selection criteria for string lists. Fix string list selection when using [<item> || <item> ...]. Signed-off-by: Daniel Golle <daniel@makrotopia.org>
58 lines
1.5 KiB
Diff
58 lines
1.5 KiB
Diff
--- a/lib/commands/toolcontext.c
|
|
+++ b/lib/commands/toolcontext.c
|
|
@@ -1669,6 +1669,7 @@ struct cmd_context *create_toolcontext(u
|
|
/* FIXME Make this configurable? */
|
|
reset_lvm_errno(1);
|
|
|
|
+#ifdef __GLIBC__
|
|
/* Set in/out stream buffering before glibc */
|
|
if (set_buffering
|
|
&& !cmd->running_on_valgrind /* Skipping within valgrind execution. */
|
|
@@ -1713,6 +1714,7 @@ struct cmd_context *create_toolcontext(u
|
|
} else if (!set_buffering)
|
|
/* Without buffering, must not use stdin/stdout */
|
|
init_silent(1);
|
|
+#endif
|
|
|
|
/*
|
|
* Environment variable LVM_SYSTEM_DIR overrides this below.
|
|
@@ -2047,6 +2049,7 @@ void destroy_toolcontext(struct cmd_cont
|
|
if (cmd->cft_def_hash)
|
|
dm_hash_destroy(cmd->cft_def_hash);
|
|
|
|
+#ifdef __GLIBC__
|
|
if (!cmd->running_on_valgrind && cmd->linebuffer) {
|
|
int flags;
|
|
/* Reset stream buffering to defaults */
|
|
@@ -2070,6 +2073,7 @@ void destroy_toolcontext(struct cmd_cont
|
|
|
|
free(cmd->linebuffer);
|
|
}
|
|
+#endif
|
|
|
|
destroy_config_context(cmd);
|
|
|
|
--- a/tools/lvmcmdline.c
|
|
+++ b/tools/lvmcmdline.c
|
|
@@ -3404,6 +3404,7 @@ int lvm_split(char *str, int *argc, char
|
|
/* Make sure we have always valid filedescriptors 0,1,2 */
|
|
static int _check_standard_fds(void)
|
|
{
|
|
+#ifdef __GLIBC__
|
|
int err = is_valid_fd(STDERR_FILENO);
|
|
|
|
if (!is_valid_fd(STDIN_FILENO) &&
|
|
@@ -3430,6 +3431,12 @@ static int _check_standard_fds(void)
|
|
strerror(errno));
|
|
return 0;
|
|
}
|
|
+#else
|
|
+ if (!is_valid_fd(STDERR_FILENO) ||
|
|
+ !is_valid_fd(STDOUT_FILENO) ||
|
|
+ !is_valid_fd(STDIN_FILENO))
|
|
+ return 0;
|
|
+#endif
|
|
|
|
return 1;
|
|
}
|