[gentoo-commits] gentoo-x86 commit in sys-kernel/dracut/files: dracut-010-rd.driver.post-fixed.patch dracut-010-rd.driver.pre-and-blacklist-fix.patch

[Amadeusz Zolnowski (aidecoe)]

aidecoe     11/06/30 21:23:39

  Added:                dracut-010-rd.driver.post-fixed.patch
                        dracut-010-rd.driver.pre-and-blacklist-fix.patch
  Log:
  sys-kernel/dracut-010: -r4 revbump; fixes bug #373007
  
  rd.driver.* kernel args handling patches.
  
  (Portage version: 2.1.10.3/cvs/Linux x86_64)

Revision  Changes    Path
1.1                  sys-kernel/dracut/files/dracut-010-rd.driver.post-fixed.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-kernel/dracut/files/dracut-010-rd.driver.post-fixed.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-kernel/dracut/files/dracut-010-rd.driver.post-fixed.patch?rev=1.1&content-type=text/plain

Index: dracut-010-rd.driver.post-fixed.patch
===================================================================
From 969a4a6b82cfe36fada9c3813ef81cb3641863af Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Amadeusz=20=C5=BBo=C5=82nowski?= <aidecoe@×××××××.name>
Date: Thu, 30 Jun 2011 22:43:34 +0200
Subject: [PATCH 2/2] 90kernel-modules: fixed handling rd.driver.post=

Conflicts:

	modules.d/90kernel-modules/insmodpost.sh
---
 modules.d/90kernel-modules/insmodpost.sh |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/modules.d/90kernel-modules/insmodpost.sh b/modules.d/90kernel-modules/insmodpost.sh
index c3d7714..168a907 100755
--- a/modules.d/90kernel-modules/insmodpost.sh
+++ b/modules.d/90kernel-modules/insmodpost.sh
@@ -2,11 +2,13 @@
 # -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*-
 # ex: ts=8 sw=4 sts=4 et filetype=sh
 
-for p in $(getargs rd.driver.post rdinsmodpost=); do 
+. /lib/dracut-lib.sh
+
+for modlist in $(getargs rd.driver.post rdinsmodpost=); do
     (
         IFS=,
-        for p in $i; do 
-            modprobe $p
+        for m in $modlist; do
+            modprobe $m
         done
     )
 done
-- 
1.7.5.3




1.1                  sys-kernel/dracut/files/dracut-010-rd.driver.pre-and-blacklist-fix.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-kernel/dracut/files/dracut-010-rd.driver.pre-and-blacklist-fix.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-kernel/dracut/files/dracut-010-rd.driver.pre-and-blacklist-fix.patch?rev=1.1&content-type=text/plain

Index: dracut-010-rd.driver.pre-and-blacklist-fix.patch
===================================================================
From ce09d0ea4ddf01076453de6dde6f86cf6f12113d Mon Sep 17 00:00:00 2001
From: Harald Hoyer <harald@××××××.com>
Date: Fri, 6 May 2011 12:06:20 +0200
Subject: [PATCH 1/2] parse-kernel.sh: wrong index was used in for loop

Thanks Mike Snitzer <msnitzer@××××××.com>
---
 modules.d/90kernel-modules/parse-kernel.sh |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules.d/90kernel-modules/parse-kernel.sh b/modules.d/90kernel-modules/parse-kernel.sh
index fceccaa..9323d42 100755
--- a/modules.d/90kernel-modules/parse-kernel.sh
+++ b/modules.d/90kernel-modules/parse-kernel.sh
@@ -2,7 +2,7 @@
 # -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*-
 # ex: ts=8 sw=4 sts=4 et filetype=sh
 
-for p in $(getargs rd.driver.pre rdloaddriver=); do 
+for i in $(getargs rd.driver.pre rdloaddriver=); do 
     ( 
         IFS=,
         for p in $i; do 
@@ -11,7 +11,7 @@ for p in $(getargs rd.driver.pre rdloaddriver=); do
     )
 done
 
-for p in $(getargs rd.driver.blacklist rdblacklist=); do 
+for i in $(getargs rd.driver.blacklist rdblacklist=); do 
     (
         IFS=,
         for p in $i; do 
-- 
1.7.5.3