|
 |
e76f14 |
From 470d49add9f9b75f963b5cd523950541d9fa3bee Mon Sep 17 00:00:00 2001
|
|
|
e76f14 |
From: "Richard W.M. Jones" <rjones@redhat.com>
|
|
|
e76f14 |
Date: Thu, 12 May 2016 16:51:53 +0100
|
|
|
e76f14 |
Subject: [PATCH] appliance: Copy /etc/ld.so.cache from the host into the
|
|
|
e76f14 |
appliance.
|
|
|
e76f14 |
|
|
|
e76f14 |
Previously we were running ldconfig to create /etc/ld.so.cache.
|
|
|
e76f14 |
|
|
|
e76f14 |
This is required, at least on Fedora, if we need to run any binary
|
|
|
e76f14 |
that uses a library with a weird path. libiscsi (a dependency of
|
|
|
e76f14 |
qemu-img, used by virt-dib) is an example of such a weird library,
|
|
|
e76f14 |
since it puts its single library into /usr/lib64/iscsi for no readily
|
|
|
e76f14 |
understandable reason, and drops a configuration file into
|
|
|
e76f14 |
/etc/ld.so.conf.d/ so that this new directory gets picked up.
|
|
|
e76f14 |
|
|
|
e76f14 |
By copying the /etc/ld.so.cache from the host we get an already
|
|
|
e76f14 |
configured cache which should contain every library on the host, so
|
|
|
e76f14 |
there is no need to run ldconfig.
|
|
|
e76f14 |
|
|
|
e76f14 |
(cherry picked from commit 634f47e6d4f1cf7ce343789d8b6257d89001f74f)
|
|
|
e76f14 |
---
|
|
|
e76f14 |
appliance/hostfiles.in | 1 +
|
|
|
e76f14 |
1 file changed, 1 insertion(+)
|
|
|
e76f14 |
|
|
|
e76f14 |
diff --git a/appliance/hostfiles.in b/appliance/hostfiles.in
|
|
|
e76f14 |
index 8ff53b5..268d712 100644
|
|
|
e76f14 |
--- a/appliance/hostfiles.in
|
|
|
e76f14 |
+++ b/appliance/hostfiles.in
|
|
|
e76f14 |
@@ -13,5 +13,6 @@ dnl SUSE=1 For OpenSUSE.
|
|
|
e76f14 |
dnl FRUGALWARE=1 For Frugalware.
|
|
|
e76f14 |
dnl MAGEIA=1 For Mageia.
|
|
|
e76f14 |
|
|
|
e76f14 |
+/etc/ld.so.cache
|
|
|
e76f14 |
/lib/lsb/*
|
|
|
e76f14 |
/usr/share/augeas/lenses/*.aug
|
|
|
e76f14 |
--
|
|
|
e76f14 |
1.8.3.1
|
|
|
e76f14 |
|