Blame 0029-base-dracut-lib.sh-add-arguments-for-source_hook-and.patch

Harald Hoyer 2f4f1d
From f8d50f60b376682217eb1a88e2e07c54cd5e9955 Mon Sep 17 00:00:00 2001
Harald Hoyer 2f4f1d
From: Harald Hoyer <harald@redhat.com>
Harald Hoyer 2f4f1d
Date: Mon, 23 Apr 2012 11:30:08 +0200
Harald Hoyer 2f4f1d
Subject: [PATCH] base/dracut-lib.sh: add arguments for source_hook() and
Harald Hoyer 2f4f1d
 source_all()
Harald Hoyer 2f4f1d
Harald Hoyer 2f4f1d
---
Harald Hoyer 2f4f1d
 modules.d/99base/dracut-lib.sh |   10 +++++++---
Harald Hoyer 2f4f1d
 1 file changed, 7 insertions(+), 3 deletions(-)
Harald Hoyer 2f4f1d
Harald Hoyer 2f4f1d
diff --git a/modules.d/99base/dracut-lib.sh b/modules.d/99base/dracut-lib.sh
Harald Hoyer 2f4f1d
index a4aa20c..a6b8d1a 100755
Harald Hoyer 2f4f1d
--- a/modules.d/99base/dracut-lib.sh
Harald Hoyer 2f4f1d
+++ b/modules.d/99base/dracut-lib.sh
Harald Hoyer 2f4f1d
@@ -264,15 +264,19 @@ setdebug
Harald Hoyer 2f4f1d
 
Harald Hoyer 2f4f1d
 source_all() {
Harald Hoyer 2f4f1d
     local f
Harald Hoyer 2f4f1d
-    [ "$1" ] && [  -d "/$1" ] || return
Harald Hoyer 2f4f1d
-    for f in "/$1"/*.sh; do [ -e "$f" ] && . "$f"; done
Harald Hoyer 2f4f1d
+    local _dir
Harald Hoyer 2f4f1d
+    _dir=$1; shift
Harald Hoyer 2f4f1d
+    [ "$_dir" ] && [  -d "/$_dir" ] || return
Harald Hoyer 2f4f1d
+    for f in "/$_dir"/*.sh; do [ -e "$f" ] && . "$f" "$@"; done
Harald Hoyer 2f4f1d
 }
Harald Hoyer 2f4f1d
 
Harald Hoyer 2f4f1d
 hookdir=/lib/dracut/hooks
Harald Hoyer 2f4f1d
 export hookdir
Harald Hoyer 2f4f1d
 
Harald Hoyer 2f4f1d
 source_hook() {
Harald Hoyer 2f4f1d
-    source_all "/lib/dracut/hooks/$1"
Harald Hoyer 2f4f1d
+    local _dir
Harald Hoyer 2f4f1d
+    _dir=$1; shift
Harald Hoyer 2f4f1d
+    source_all "/lib/dracut/hooks/$_dir" "$@"
Harald Hoyer 2f4f1d
 }
Harald Hoyer 2f4f1d
 
Harald Hoyer 2f4f1d
 check_finished() {