[gentoo-commits] gentoo-x86 commit in sys-kernel/dracut/files: 040-0007-Take-into-account-lib64-dirs-when-dete.patch

[Amadeusz Zolnowski (aidecoe)]

aidecoe     15/01/11 14:20:14

  Added:               
                        040-0007-Take-into-account-lib64-dirs-when-dete.patch
  Log:
  Fix lsinitrd failure to detect version and modules - bug #533112.
  
  Thanks to poncho <pon...@spahan.ch> and Jeroen Roovers <j...@gentoo.org> for
  patch.
  
  (Portage version: 2.2.15/cvs/Linux x86_64, signed Manifest commit with key 
F0134531E1DBFAB5)

Revision  Changes    Path
1.1                  
sys-kernel/dracut/files/040-0007-Take-into-account-lib64-dirs-when-dete.patch

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-kernel/dracut/files/040-0007-Take-into-account-lib64-dirs-when-dete.patch?rev=1.1&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-kernel/dracut/files/040-0007-Take-into-account-lib64-dirs-when-dete.patch?rev=1.1&content-type=text/plain

Index: 040-0007-Take-into-account-lib64-dirs-when-dete.patch
===================================================================
>From 25efd305dace3275c661e0a7dfbaef42b4cbc6d7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Amadeusz=20=C5=BBo=C5=82nowski?= <aide...@aidecoe.name>
Date: Sun, 11 Jan 2015 15:10:39 +0100
Subject: [PATCH 7/7] Take into account lib64 dirs when detecting version,
 modules and params

---
 lsinitrd.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lsinitrd.sh b/lsinitrd.sh
index 4f12c2c..dc1f88f 100755
--- a/lsinitrd.sh
+++ b/lsinitrd.sh
@@ -124,7 +124,7 @@ extract_files()
 list_modules()
 {
     echo "dracut modules:"
-    $CAT "$image" | cpio --extract --verbose --quiet --to-stdout -- 
'lib/dracut/modules.txt' 'usr/lib/dracut/modules.txt' 2>/dev/null
+    $CAT "$image" | cpio --extract --verbose --quiet --to-stdout -- 
'lib64/dracut/modules.txt' 'lib/dracut/modules.txt' 
'usr/lib/dracut/modules.txt' 2>/dev/null
     ((ret+=$?))
 }
 
@@ -217,7 +217,7 @@ ret=0
 if (( ${#filenames[@]} > 0 )); then
     extract_files
 else
-    version=$($CAT "$image" | cpio --extract --verbose --quiet --to-stdout -- 
'lib/dracut/dracut-*' 'usr/lib/dracut/dracut-*' 2>/dev/null)
+    version=$($CAT "$image" | cpio --extract --verbose --quiet --to-stdout -- 
'lib64/dracut/dracut-*' 'lib/dracut/dracut-*' 'usr/lib/dracut/dracut-*' 
2>/dev/null)
     ((ret+=$?))
     echo "Version: $version"
     echo
@@ -226,7 +226,7 @@ else
         echo 
"========================================================================"
     else
         echo -n "Arguments: "
-        $CAT "$image" | cpio --extract --verbose --quiet --to-stdout -- 
'lib/dracut/build-parameter.txt' 'usr/lib/dracut/build-parameter.txt' 
2>/dev/null
+        $CAT "$image" | cpio --extract --verbose --quiet --to-stdout -- 
'lib64/dracut/build-parameter.txt' 'lib/dracut/build-parameter.txt' 
'usr/lib/dracut/build-parameter.txt' 2>/dev/null
         echo
         list_modules
         list_files
-- 
2.2.1