diff options
| author | Waldemar Brodkorb <wbrodkorb@conet.de> | 2015-03-04 09:21:57 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbrodkorb@conet.de> | 2015-03-04 09:21:57 +0100 |
| commit | 4fc74012b67cfc62c5481b8d7b6d95052f40c2bf (patch) | |
| tree | d6f7c860195c63564d98f53c143acbf0082ea3ca /package/lvm/patches/patch-tools_lvmcmdline_c | |
| parent | 68b4cb5aaa95eb39401bcbaa7c517cfd31c3edcf (diff) | |
| parent | 9919c4bc2f53037331313edace085c386c2af4cc (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'package/lvm/patches/patch-tools_lvmcmdline_c')
| -rw-r--r-- | package/lvm/patches/patch-tools_lvmcmdline_c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/package/lvm/patches/patch-tools_lvmcmdline_c b/package/lvm/patches/patch-tools_lvmcmdline_c index 13124f32d..df9a068cd 100644 --- a/package/lvm/patches/patch-tools_lvmcmdline_c +++ b/package/lvm/patches/patch-tools_lvmcmdline_c @@ -1,6 +1,6 @@ ---- LVM2.2.02.106.orig/tools/lvmcmdline.c 2014-04-10 17:38:46.000000000 +0200 -+++ LVM2.2.02.106/tools/lvmcmdline.c 2014-05-29 16:57:14.221581766 +0200 -@@ -1252,9 +1252,12 @@ int lvm_split(char *str, int *argc, char +--- LVM2.2.02.114.orig/tools/lvmcmdline.c 2014-11-29 00:07:43.000000000 +0100 ++++ LVM2.2.02.114/tools/lvmcmdline.c 2015-02-28 09:27:09.000000000 +0100 +@@ -1536,9 +1536,12 @@ int lvm_split(char *str, int *argc, char static int _check_standard_fds(void) { int err = is_valid_fd(STDERR_FILENO); @@ -14,7 +14,7 @@ if (err) perror("stdin stream open"); else -@@ -1264,7 +1267,7 @@ static int _check_standard_fds(void) +@@ -1548,7 +1551,7 @@ static int _check_standard_fds(void) } if (!is_valid_fd(STDOUT_FILENO) && @@ -23,7 +23,7 @@ if (err) perror("stdout stream open"); /* else no stdout */ -@@ -1272,7 +1275,7 @@ static int _check_standard_fds(void) +@@ -1556,7 +1559,7 @@ static int _check_standard_fds(void) } if (!is_valid_fd(STDERR_FILENO) && |