Fixing cache_path: taking into account the three forms of ldd output lines.
authorTails developers <amnesia@boum.org>
Sat, 8 Jan 2011 17:43:38 +0000 (18:43 +0100)
committerTails developers <amnesia@boum.org>
Wed, 7 Sep 2011 11:55:27 +0000 (13:55 +0200)
debian/live-boot.init

index 1130730..5799c44 100644 (file)
@@ -49,8 +49,24 @@ cache_path()
        then
                if file -L "${path}" | grep -q 'dynamically linked'
                then
-                       for lib in $(ldd "${path}" | awk '{ print $3 }')
+                       # ldd output can be of three forms:
+                       # 1. linux-vdso.so.1 =>  (0x00007fffe3fb4000)
+                       #    This is a virtual, kernel shared library and we want to skip it
+                       # 2. libc.so.6 => /lib/libc.so.6 (0x00007f5e9dc0c000)
+                       #    We want to cache the third word.
+                       # 3. /lib64/ld-linux-x86-64.so.2 (0x00007f5e9df8b000)
+                       #    We want to cache the first word.
+                       ldd "${path}" | while read line
                        do
+                               if echo "$line" | grep -qs ' =>  '
+                               then
+                                       continue
+                               elif echo "$line" | grep -qs ' => '
+                               then
+                                       lib=$(echo "${line}" | awk '{ print $3 }')
+                               else
+                                       lib=$(echo "${line}" | awk '{ print $1 }')
+                               fi
                                cache_path "${lib}"
                        done
                fi