Blame SOURCES/0063-ntfsresize-Capture-errors-sent-to-stdout-RHBZ-116661.patch
|
 |
0d20ef |
From e871083162bb0f42931b8f218d98f370f6c017d4 Mon Sep 17 00:00:00 2001
|
|
|
0d20ef |
From: "Richard W.M. Jones" <rjones@redhat.com>
|
|
|
0d20ef |
Date: Mon, 24 Nov 2014 10:56:57 +0000
|
|
|
0d20ef |
Subject: [PATCH] ntfsresize: Capture errors sent to stdout (RHBZ#1166618).
|
|
|
0d20ef |
|
|
|
0d20ef |
ntfsresize sends error messages to stdout. Capture those error
|
|
|
0d20ef |
messages.
|
|
|
0d20ef |
|
|
|
0d20ef |
(cherry picked from commit dc845c9a6694dc7f06894e0df137176a4da73c66)
|
|
|
0d20ef |
---
|
|
|
0d20ef |
daemon/ntfs.c | 2 +-
|
|
|
0d20ef |
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
0d20ef |
|
|
|
0d20ef |
diff --git a/daemon/ntfs.c b/daemon/ntfs.c
|
|
|
0d20ef |
index aef45a2..762ca88 100644
|
|
|
0d20ef |
--- a/daemon/ntfs.c
|
|
|
0d20ef |
+++ b/daemon/ntfs.c
|
|
|
0d20ef |
@@ -94,7 +94,7 @@ do_ntfsresize (const char *device, int64_t size, int force)
|
|
|
0d20ef |
ADD_ARG (argv, i, device);
|
|
|
0d20ef |
ADD_ARG (argv, i, NULL);
|
|
|
0d20ef |
|
|
|
0d20ef |
- r = commandv (NULL, &err, argv);
|
|
|
0d20ef |
+ r = commandvf (NULL, &err, COMMAND_FLAG_FOLD_STDOUT_ON_STDERR, argv);
|
|
|
0d20ef |
if (r == -1) {
|
|
|
0d20ef |
reply_with_error ("%s: %s", device, err);
|
|
|
0d20ef |
return -1;
|
|
|
0d20ef |
--
|
|
|
0d20ef |
1.8.3.1
|
|
|
0d20ef |
|