Blob Blame History Raw
Patch sent to Stephan Kulow on 2009-10-12
-----------------------------------------
[PATCH icecream] allow ldconfig to fail when creating the environment

We should only expect ld.so.cache to be created if ldconfig finished
successfully.

ld.so.cache is not essential for correct functioning of the
created environment.

ldconfig may fail for example if SELinux enforcing policy prevents
it from working in the confined domain. That's actually how I
noticed this. The tar at the end of the script was failing because of
it. And yes, I will look at fixing the policy too...

Michal

Index: icecc-0.9.4/client/icecc-create-env
===================================================================
--- icecc-0.9.4.orig/client/icecc-create-env
+++ icecc-0.9.4/client/icecc-create-env
@@ -157,8 +157,8 @@ for i in $target_files; do 
 done
 
 if test -x /sbin/ldconfig; then
-   /sbin/ldconfig -r $tempdir
-   new_target_files="$new_target_files etc/ld.so.cache"
+   /sbin/ldconfig -r $tempdir && \
+      new_target_files="$new_target_files etc/ld.so.cache"
 fi
 
 md5sum=NONE