diff options
| author | David Tardon <dtardon@redhat.com> | 2021-08-30 10:02:22 +0200 |
|---|---|---|
| committer | Jóhann B. Guðmundsson <johannbg@gmail.com> | 2021-09-13 12:26:14 +0000 |
| commit | 10ed204f873f454dcd15ffcc82dc3a1c781c1514 (patch) | |
| tree | 6bb297f3b1bbaa57759f3d1a2a2f4c63ac5bc48f | |
| parent | 591118c56da2bfcea060e3b7671bc87b23c0e44a (diff) | |
| download | dracut-10ed204f873f454dcd15ffcc82dc3a1c781c1514.tar.gz | |
fix(install): extend hwcaps library handling to libraries under glibc-hwcaps/
| -rw-r--r-- | src/install/dracut-install.c | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/src/install/dracut-install.c b/src/install/dracut-install.c index f1e76bef..401c09d7 100644 --- a/src/install/dracut-install.c +++ b/src/install/dracut-install.c @@ -354,8 +354,8 @@ normal_copy: static int library_install(const char *src, const char *lib) { _cleanup_free_ char *p = NULL; - _cleanup_free_ char *pdir = NULL, *ppdir = NULL, *clib = NULL; - char *q; + _cleanup_free_ char *pdir = NULL, *ppdir = NULL, *pppdir = NULL, *clib = NULL; + char *q, *clibdir; int r, ret = 0; p = strdup(lib); @@ -377,7 +377,8 @@ static int library_install(const char *src, const char *lib) log_debug("Lib install: '%s'", p); } - /* Also try to install the same library from one directory above. + /* Also try to install the same library from one directory above + * or from one directory above glibc-hwcaps. This fixes the case, where only the HWCAP lib would be installed # ldconfig -p|grep -F libc.so libc.so.6 (libc6,64bit, hwcap: 0x0000001000000000, OS ABI: Linux 2.6.32) => /lib64/power6/libc.so.6 @@ -398,10 +399,18 @@ static int library_install(const char *src, const char *lib) return ret; ppdir = strdup(ppdir); + pppdir = dirname(ppdir); + if (!pppdir) + return ret; + + pppdir = strdup(pppdir); + if (!pppdir) + return ret; strcpy(p, lib); - clib = strjoin(ppdir, "/", basename(p), NULL); + clibdir = streq(basename(ppdir), "glibc-hwcaps") ? pppdir : ppdir; + clib = strjoin(clibdir, "/", basename(p), NULL); if (dracut_install(clib, clib, false, false, true) == 0) log_debug("Lib install: '%s'", clib); /* also install lib.so for lib.so.* files */ |