summaryrefslogtreecommitdiff
path: root/system/lvm2/fix-stdio-usage.patch
diff options
context:
space:
mode:
authorMax Rees <maxcrees@me.com>2020-03-22 16:41:03 -0500
committerMax Rees <maxcrees@me.com>2020-03-22 16:41:03 -0500
commitf51115257428f62d5eba42955c7895b16dba0ebe (patch)
treed764ba77c575ac907c98b09f0ffc5b53b21a1df7 /system/lvm2/fix-stdio-usage.patch
parentcf52fe9940f6e2205819493b5c8e18834239fe0b (diff)
downloadpackages-f51115257428f62d5eba42955c7895b16dba0ebe.tar.gz
packages-f51115257428f62d5eba42955c7895b16dba0ebe.tar.bz2
packages-f51115257428f62d5eba42955c7895b16dba0ebe.tar.xz
packages-f51115257428f62d5eba42955c7895b16dba0ebe.zip
system/lvm2: fix crash on startup due to std fd nonsense
Diffstat (limited to 'system/lvm2/fix-stdio-usage.patch')
-rw-r--r--system/lvm2/fix-stdio-usage.patch30
1 files changed, 25 insertions, 5 deletions
diff --git a/system/lvm2/fix-stdio-usage.patch b/system/lvm2/fix-stdio-usage.patch
index d5cc43f65..6b7ee0eaa 100644
--- a/system/lvm2/fix-stdio-usage.patch
+++ b/system/lvm2/fix-stdio-usage.patch
@@ -1,6 +1,6 @@
---- ./tools/lvmcmdline.c
-+++ ./tools/lvmcmdline.c
-@@ -1252,7 +1252,7 @@
+--- LVM2.2.03.08/tools/lvmcmdline.c 2020-02-11 03:59:27.000000000 -0600
++++ LVM2.2.03.08/tools/lvmcmdline.c 2020-03-22 16:17:35.470100377 -0500
+@@ -3233,7 +3233,7 @@ static int _check_standard_fds(void)
int err = is_valid_fd(STDERR_FILENO);
if (!is_valid_fd(STDIN_FILENO) &&
@@ -9,7 +9,7 @@
if (err)
perror("stdin stream open");
else
-@@ -1262,7 +1262,7 @@
+@@ -3243,7 +3243,7 @@ static int _check_standard_fds(void)
}
if (!is_valid_fd(STDOUT_FILENO) &&
@@ -18,7 +18,7 @@
if (err)
perror("stdout stream open");
/* else no stdout */
-@@ -1270,7 +1270,7 @@
+@@ -3251,7 +3251,7 @@ static int _check_standard_fds(void)
}
if (!is_valid_fd(STDERR_FILENO) &&
@@ -27,3 +27,23 @@
printf("stderr stream open: %s\n",
strerror(errno));
return 0;
+--- LVM2.2.03.08/lib/commands/toolcontext.c 2020-02-11 03:59:27.000000000 -0600
++++ LVM2.2.03.08/lib/commands/toolcontext.c 2020-03-22 16:18:35.130101016 -0500
+@@ -1599,7 +1599,7 @@ struct cmd_context *create_toolcontext(u
+ /* FIXME Make this configurable? */
+ reset_lvm_errno(1);
+
+-#ifndef VALGRIND_POOL
++#if !defined(VALGRIND_POOL) && defined(__GLIBC__)
+ /* Set in/out stream buffering before glibc */
+ if (set_buffering
+ #ifdef SYS_gettid
+@@ -1980,7 +1980,7 @@ void destroy_toolcontext(struct cmd_cont
+
+ if (cmd->pending_delete_mem)
+ dm_pool_destroy(cmd->pending_delete_mem);
+-#ifndef VALGRIND_POOL
++#if !defined(VALGRIND_POOL) && defined(__GLIBC__)
+ if (cmd->linebuffer) {
+ /* Reset stream buffering to defaults */
+ if (is_valid_fd(STDIN_FILENO) &&