85c7d46
Patch sent to Stephan Kulow on 2009-10-12
85c7d46
-----------------------------------------
85c7d46
[PATCH icecream] allow ldconfig to fail when creating the environment
85c7d46
85c7d46
We should only expect ld.so.cache to be created if ldconfig finished
85c7d46
successfully.
85c7d46
85c7d46
ld.so.cache is not essential for correct functioning of the
85c7d46
created environment.
85c7d46
85c7d46
ldconfig may fail for example if SELinux enforcing policy prevents
85c7d46
it from working in the confined domain. That's actually how I
85c7d46
noticed this. The tar at the end of the script was failing because of
85c7d46
it. And yes, I will look at fixing the policy too...
85c7d46
85c7d46
Michal
85c7d46
85c7d46
Index: icecc-0.9.4/client/icecc-create-env
85c7d46
===================================================================
85c7d46
--- icecc-0.9.4.orig/client/icecc-create-env
85c7d46
+++ icecc-0.9.4/client/icecc-create-env
85c7d46
@@ -157,8 +157,8 @@ for i in $target_files; do 
85c7d46
 done
85c7d46
 
85c7d46
 if test -x /sbin/ldconfig; then
85c7d46
-   /sbin/ldconfig -r $tempdir
85c7d46
-   new_target_files="$new_target_files etc/ld.so.cache"
85c7d46
+   /sbin/ldconfig -r $tempdir && \
85c7d46
+      new_target_files="$new_target_files etc/ld.so.cache"
85c7d46
 fi
85c7d46
 
85c7d46
 md5sum=NONE