Differential D12163 Diff 29540 files/0001-Support-stateless-glibc-ldconfig-configuration.patch

Changeset View

Standalone View

files/0001-Support-stateless-glibc-ldconfig-configuration.patch

	From 24fb2f6c9691cb4f1d91ac918914e563c605ae97 Mon Sep 17 00:00:00 2001			From 24fb2f6c9691cb4f1d91ac918914e563c605ae97 Mon Sep 17 00:00:00 2001
	From: Ikey Doherty <ikey@solus-project.com>			From: Ikey Doherty <ikey@solus-project.com>
	Date: Fri, 16 Dec 2016 05:04:48 +0000			Date: Fri, 16 Dec 2016 05:04:48 +0000
	Subject: [PATCH 1/3] Support stateless glibc ldconfig configuration			Subject: [PATCH 1/3] Support stateless glibc ldconfig configuration

	Signed-off-by: Ikey Doherty <ikey@solus-project.com>			Signed-off-by: Ikey Doherty <ikey@solus-project.com>
	---			---
	dracut.sh \| 2 +-			dracut.sh \| 2 +-
	1 file changed, 1 insertion(+), 1 deletion(-)			1 file changed, 1 insertion(+), 1 deletion(-)

	diff --git a/dracut.sh b/dracut.sh			diff --git a/dracut.sh b/dracut.sh
	index 3a136d4..dc87082 100755			index 60ac46f..fbcd6ef 100755
	--- a/dracut.sh			--- a/dracut.sh
	+++ b/dracut.sh			+++ b/dracut.sh
	@@ -1570,7 +1570,7 @@ done			@@ -2228,7 +2228,7 @@ fi

	if [[ $kernel_only != yes ]]; then			if [[ $kernel_only != yes ]]; then
	# make sure that library links are correct and up to date			# make sure that library links are correct and up to date
	- for f in /etc/ld.so.conf /etc/ld.so.conf.d/*; do			- for f in "$dracutsysrootdir"/etc/ld.so.conf "$dracutsysrootdir"/etc/ld.so.conf.d/*; do
	+ for f in /etc/ld.so.conf /etc/ld.so.conf.d/* /usr/share/defaults/etc/ld.so.conf /usr/share/ld.so.conf.d/*; do			+ for f in "$dracutsysrootdir"/etc/ld.so.conf "$dracutsysrootdir"/etc/ld.so.conf.d/* "$dracutsysrootdir"/usr/share/defaults/etc/ld.so.conf "$dracutsysrootdir"/usr/share/ld.so.conf.d/*; do
	[[ -f $f ]] && inst_simple "$f"			[[ -f $f ]] && inst_simple "${f#$dracutsysrootdir}"
	done			done
	if ! ldconfig -r "$initdir"; then			if ! $DRACUT_LDCONFIG -r "$initdir" -f /etc/ld.so.conf; then
	--			--
	2.15.0			2.33.1