From: Harald Hoyer <harald@redhat.com>
Date: Tue, 10 Jul 2012 08:53:28 +0000 (+0200)
Subject: install/dracut-install.c: redirect stderr to stdout and skip loader
X-Git-Tag: 021~37
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a92311074b487608bfd632ae3b443067d237b6f8;p=thirdparty%2Fdracut.git

install/dracut-install.c: redirect stderr to stdout and skip loader

skip if ldd was run on the loader
---

diff --git a/install/dracut-install.c b/install/dracut-install.c
index 1d5748d33..ee6950ae2 100644
--- a/install/dracut-install.c
+++ b/install/dracut-install.c
@@ -268,7 +268,7 @@ static int resolve_deps(const char *src)
         }
 
         /* run ldd */
-        asprintf(&cmd, "ldd %s", src);
+        asprintf(&cmd, "ldd %s 2>&1", src);
         fptr = popen(cmd, "r");
 
         while (!feof(fptr)) {
@@ -282,6 +282,9 @@ static int resolve_deps(const char *src)
                 if (strstr(buf, "not a dynamic executable"))
                         break;
 
+                if (strstr(buf, "loader cannot load itself"))
+                        break;
+
                 p = strstr(buf, "/");
                 if (p) {
                         int r;