kernel
/
dracut
mirror of https://git.kernel.org/pub/scm/boot/dracut/dracut.git/
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

dracut-install,dracut: fix ldd output parsing 

dracut-install could not handle output like:
	/lib/$LIB/liblsp.so => /lib/lib64/liblsp.so (0x00007faf00727000)

also unset LD_PRELOAD, so we get a clean environment
master
Harald Hoyer 2014-01-17 11:52:43 +01:00
parent 7e916ae4e0
commit 45404a2ad8
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
dracut.sh
View File

@ -548,6 +548,7 @@ export LC_ALL=C
export LANG=C export LANG=C
unset NPATH unset NPATH
unset LD_LIBRARY_PATH unset LD_LIBRARY_PATH
unset LD_PRELOAD
unset GREP_OPTIONS unset GREP_OPTIONS


export DRACUT_LOG_LEVEL=warning export DRACUT_LOG_LEVEL=warning

6
install/dracut-install.c
View File

@ -392,7 +392,11 @@ static int resolve_deps(const char *src)
if (strstr(buf, destrootdir)) if (strstr(buf, destrootdir))
break; break;


p = strchr(buf, '/'); p = strstr(buf, "=>");
if (!p)
p = buf;

p = strchr(p, '/');
if (p) { if (p) {
for (q = p; *q && *q != ' ' && *q != '\n'; q++) ; for (q = p; *q && *q != ' ' && *q != '\n'; q++) ;
*q = '\0'; *q = '\0';