[gentoo-commits] gentoo-x86 commit in sys-kernel/dracut/files: 022-0016-dracut.sh-test-if-we-can-lazy-resolve-.patch

[Amadeusz Zolnowski (aidecoe)]

aidecoe     12/07/30 20:26:32

  Added:               
                        022-0016-dracut.sh-test-if-we-can-lazy-resolve-.patch
  Log:
  Rev-bump. Fixes bug #428232.
  
  (Portage version: 2.1.11.9/cvs/Linux x86_64)

Revision  Changes    Path
1.1                  sys-kernel/dracut/files/022-0016-dracut.sh-test-if-we-can-lazy-resolve-.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-kernel/dracut/files/022-0016-dracut.sh-test-if-we-can-lazy-resolve-.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-kernel/dracut/files/022-0016-dracut.sh-test-if-we-can-lazy-resolve-.patch?rev=1.1&content-type=text/plain

Index: 022-0016-dracut.sh-test-if-we-can-lazy-resolve-.patch
===================================================================
From d642c41070e1e8f3a74346a3105a35a5c0af0058 Mon Sep 17 00:00:00 2001
From: Harald Hoyer <harald@××××××.com>
Date: Mon, 30 Jul 2012 13:02:41 +0200
Subject: [PATCH 16/16] dracut.sh: test if we can lazy resolve with ldd

---
 dracut.sh |    9 ++++++++-
 1 files changed, 8 insertions(+), 1 deletions(-)

diff --git a/dracut.sh b/dracut.sh
index 107fc27..2235e9a 100755
--- a/dracut.sh
+++ b/dracut.sh
@@ -600,11 +600,18 @@ else
     exit 1
 fi
 
+inst /bin/sh
+if ! $DRACUT_INSTALL ${initdir+-D "$initdir"} -R "$initdir/bin/sh" &>/dev/null; then
+    unset DRACUT_RESOLVE_LAZY
+    export DRACUT_RESOLVE_DEPS=1
+fi
+rm -fr ${initdir}/*
+
 if [[ -f $dracutbasedir/dracut-version.sh ]]; then
     . $dracutbasedir/dracut-version.sh
 fi
 
-# Verify bash version, curret minimum is 3.1
+# Verify bash version, current minimum is 3.1
 if (( ${BASH_VERSINFO[0]} < 3 ||
     ( ${BASH_VERSINFO[0]} == 3 && ${BASH_VERSINFO[1]} < 1 ) )); then
     dfatal 'You need at least Bash 3.1 to use dracut, sorry.'
-- 
1.7.8.6