discover: we need stderr for the BusyBox TFTP type check
authorJeremy Kerr <jk@ozlabs.org>
Tue, 14 Jan 2014 07:58:31 +0000 (15:58 +0800)
committerJeremy Kerr <jk@ozlabs.org>
Tue, 14 Jan 2014 07:58:31 +0000 (15:58 +0800)
Busybox tftp doesn't support -V, so prints an error to stderr. We'll
only see the Busybox identifier if we capture stderr too.

Signed-off-by: Jeremy Kerr <jk@ozlabs.org>
discover/paths.c

index 0c8cc8b0d4c1a84596c66ab1f27073cff5446435..5e577ebc7baeee7b96871339acbb6279fcc3cb56 100644 (file)
@@ -222,6 +222,7 @@ static enum tftp_type check_tftp_type(void *ctx)
        process->path = pb_system_apps.tftp;
        process->argv = argv;
        process->keep_stdout = true;
        process->path = pb_system_apps.tftp;
        process->argv = argv;
        process->keep_stdout = true;
+       process->add_stderr = true;
        process_run_sync(process);
 
        if (!process->stdout_buf || process->stdout_len == 0) {
        process_run_sync(process);
 
        if (!process->stdout_buf || process->stdout_len == 0) {