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