diff --git a/0027-dracut-don-t-fail-on-empty-etc-ld.so.conf.d.patch b/0027-dracut-don-t-fail-on-empty-etc-ld.so.conf.d.patch new file mode 100644 index 0000000..0b16d25 --- /dev/null +++ b/0027-dracut-don-t-fail-on-empty-etc-ld.so.conf.d.patch @@ -0,0 +1,24 @@ +From 76353076c081ac51647214c5ce910aba027b25db Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Amadeusz=20=C5=BBo=C5=82nowski?= +Date: Sat, 2 Apr 2011 00:45:44 +0200 +Subject: [PATCH] dracut: don't fail on empty /etc/ld.so.conf.d/ + +--- + dracut | 4 +++- + 1 files changed, 3 insertions(+), 1 deletions(-) + +diff --git a/dracut b/dracut +index c6605bb..15a5ee5 100755 +--- a/dracut ++++ b/dracut +@@ -524,7 +524,9 @@ done + unset item + + # make sure that library links are correct and up to date +-dracut_install /etc/ld.so.conf /etc/ld.so.conf.d/* ++for f in /etc/ld.so.conf /etc/ld.so.conf.d/*; do ++ [[ -e $f ]] && dracut_install "$f" ++done + if ! ldconfig -r "$initdir"; then + if [[ $UID = 0 ]]; then + derror "ldconfig exited ungracefully" diff --git a/dracut.spec b/dracut.spec index b56240a..7bd8429 100644 --- a/dracut.spec +++ b/dracut.spec @@ -8,7 +8,7 @@ Name: dracut Version: 009 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Initramfs generator using udev %if 0%{?fedora} @@ -38,6 +38,7 @@ Patch17: 0017-plymouth-use-run-plymouth-pid-instead-of-run-initram.patch Patch18: 0018-dmsquash-live-dmsquash-live-genrules.sh-fixed-udev-r.patch Patch19: 0019-base-dracut-lib.sh-changed-kmgs-log-levels.patch Patch20: 0020-base-init-reset-PATH-after-the-run-move.patch +Patch27: 0027-dracut-don-t-fail-on-empty-etc-ld.so.conf.d.patch BuildArch: noarch @@ -189,6 +190,7 @@ This package contains tools to assemble the local initrd and host configuration. %patch18 -p1 %patch19 -p1 %patch20 -p1 +%patch27 -p1 %build make WITH_SWITCH_ROOT=0%{?with_switch_root} @@ -325,6 +327,10 @@ rm -rf $RPM_BUILD_ROOT %dir /var/lib/dracut/overlay %changelog +* Mon Apr 18 2011 Harald Hoyer 009-6 +- do not fail on empty ld.so.conf.d +Resolves: rhbz#696997 + * Thu Mar 31 2011 Harald Hoyer 009-5 - fixed PATH and kmsg logging