[SCM] live-boot branch, debian-next, updated. debian/3.0_a20-1-4-ga8ee91a
Tails developers
amnesia at boum.org
Wed Sep 7 12:43:44 UTC 2011
The following commit has been merged in the debian-next branch:
commit d47bea550abcaa87df62bece5f6a94eeb97c8487
Author: Tails developers <amnesia at boum.org>
Date: Sat Jan 8 18:09:01 2011 +0100
Fixing cache_path: cache non-executable libs dependencies as well.
Most shared libraries are not executable and nevertheless depend on other shared
libraries. These dependencies must be cached as well.
diff --git a/debian/live-boot.init b/debian/live-boot.init
index cd2e4cd..1130730 100644
--- a/debian/live-boot.init
+++ b/debian/live-boot.init
@@ -47,15 +47,12 @@ cache_path()
find "${path}" -type f | xargs cat > /dev/null 2>&1
elif [ -f "${path}" ]
then
- if [ -x "${path}" ]
+ if file -L "${path}" | grep -q 'dynamically linked'
then
- if file -L "${path}" | grep -q 'dynamically linked'
- then
- for lib in $(ldd "${path}" | awk '{ print $3 }')
- do
- cache_path "${lib}"
- done
- fi
+ for lib in $(ldd "${path}" | awk '{ print $3 }')
+ do
+ cache_path "${lib}"
+ done
fi
cat "${path}" >/dev/null 2>&1
--
live-boot
More information about the debian-live-changes
mailing list