From 27458b10ffdd6f97019a4f466e044b09623d06c0 Mon Sep 17 00:00:00 2001 From: Harald Hoyer Date: Tue, 30 Jul 2013 15:25:44 +0200 Subject: [PATCH] url-lib/module-setup.sh: fixed grepping libcurl --- modules.d/45url-lib/module-setup.sh | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/modules.d/45url-lib/module-setup.sh b/modules.d/45url-lib/module-setup.sh index e8b97003..3e82548b 100755 --- a/modules.d/45url-lib/module-setup.sh +++ b/modules.d/45url-lib/module-setup.sh @@ -12,7 +12,7 @@ depends() { } install() { - local _dir _crt _found + local _dir _crt _found _lib inst_simple "$moddir/url-lib.sh" "/lib/url-lib.sh" dracut_install curl # also install libs for curl https @@ -22,8 +22,10 @@ install() { inst_libdir_file "libsqlite3.so*" for _dir in $libdirs; do - [[ -d $_dir ]] || continue - _crt=$(grep -F --binary-files=text -z .crt $_dir/libcurl.so) + [[ -d $_dir ]] || continue + for _lib in $_dir/libcurl.so.*; do + [[ -e $_lib ]] || continue + _crt=$(grep -F --binary-files=text -z .crt $_lib) [[ $_crt ]] || continue [[ $_crt == /*/* ]] || continue if ! inst_simple "$_crt"; then @@ -31,6 +33,7 @@ install() { continue fi _found=1 + done done [[ $_found ]] || dwarn "Couldn't find SSL CA cert bundle; HTTPS won't work." } -- 2.34.1