Gentoo Archives: gentoo-commits

From: "Amadeusz Zolnowski (aidecoe)" <aidecoe@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in sys-kernel/dracut/files: dracut-010-empty-etc-ld.so.conf.d.patch
Date: Fri, 01 Apr 2011 22:54:46
Message-Id: 20110401225437.223462005C@flycatcher.gentoo.org
1 aidecoe 11/04/01 22:54:37
2
3 Added: dracut-010-empty-etc-ld.so.conf.d.patch
4 Log:
5 sys-kernel/dracut: Rev-bump to 010-r1. Fixes #361603.
6
7 (Portage version: 2.1.9.45/cvs/Linux x86_64)
8
9 Revision Changes Path
10 1.1 sys-kernel/dracut/files/dracut-010-empty-etc-ld.so.conf.d.patch
11
12 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-kernel/dracut/files/dracut-010-empty-etc-ld.so.conf.d.patch?rev=1.1&view=markup
13 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-kernel/dracut/files/dracut-010-empty-etc-ld.so.conf.d.patch?rev=1.1&content-type=text/plain
14
15 Index: dracut-010-empty-etc-ld.so.conf.d.patch
16 ===================================================================
17 From 9aa83aa66ab6d31f30ed4d25a39b1ece067e0453 Mon Sep 17 00:00:00 2001
18 From: =?UTF-8?q?Amadeusz=20=C5=BBo=C5=82nowski?= <aidecoe@×××××××.name>
19 Date: Sat, 2 Apr 2011 00:39:38 +0200
20 Subject: [PATCH] dracut: don't fail on empty /etc/ld.so.conf.d/
21
22 ---
23 dracut | 4 +++-
24 1 files changed, 3 insertions(+), 1 deletions(-)
25
26 diff --git a/dracut b/dracut
27 index c6605bb..15a5ee5 100755
28 --- a/dracut
29 +++ b/dracut
30 @@ -524,7 +524,9 @@ done
31 unset item
32
33 # make sure that library links are correct and up to date
34 -dracut_install /etc/ld.so.conf /etc/ld.so.conf.d/*
35 +for f in /etc/ld.so.conf /etc/ld.so.conf.d/*; do
36 + [[ -e $f ]] && dracut_install "$f"
37 +done
38 if ! ldconfig -r "$initdir"; then
39 if [[ $UID = 0 ]]; then
40 derror "ldconfig exited ungracefully"
41 --
42 1.7.4.1