Blame 0040-dracut-lib.sh-fixed-getargs-for-empty-arguments.patch
|
Harald Hoyer |
7f792c |
From d609c64209af738540f629bccecdef8c6bafa91d Mon Sep 17 00:00:00 2001
|
|
Harald Hoyer |
7f792c |
From: Harald Hoyer <harald@redhat.com>
|
|
Harald Hoyer |
7f792c |
Date: Wed, 10 Aug 2011 20:03:21 +0200
|
|
Harald Hoyer |
7f792c |
Subject: [PATCH] dracut-lib.sh: fixed getargs() for empty arguments
|
|
Harald Hoyer |
7f792c |
|
|
Harald Hoyer |
7f792c |
---
|
|
Harald Hoyer |
7f792c |
modules.d/99base/dracut-lib.sh | 14 +++++++++++---
|
|
Harald Hoyer |
7f792c |
1 files changed, 11 insertions(+), 3 deletions(-)
|
|
Harald Hoyer |
7f792c |
|
|
Harald Hoyer |
7f792c |
diff --git a/modules.d/99base/dracut-lib.sh b/modules.d/99base/dracut-lib.sh
|
|
Harald Hoyer |
7f792c |
index 80c1f84..dec5d92 100755
|
|
Harald Hoyer |
7f792c |
--- a/modules.d/99base/dracut-lib.sh
|
|
Harald Hoyer |
7f792c |
+++ b/modules.d/99base/dracut-lib.sh
|
|
Harald Hoyer |
7f792c |
@@ -142,11 +142,19 @@ _dogetargs() {
|
|
Harald Hoyer |
7f792c |
}
|
|
Harald Hoyer |
7f792c |
|
|
Harald Hoyer |
7f792c |
getargs() {
|
|
Harald Hoyer |
7f792c |
- local _val
|
|
Harald Hoyer |
7f792c |
- unset _val
|
|
Harald Hoyer |
7f792c |
set +x
|
|
Harald Hoyer |
7f792c |
+ local _val _nval
|
|
Harald Hoyer |
7f792c |
+ unset _val
|
|
Harald Hoyer |
7f792c |
+ unset _nval
|
|
Harald Hoyer |
7f792c |
while [ $# -gt 0 ]; do
|
|
Harald Hoyer |
7f792c |
- _val="$_val $(_dogetargs $1)"
|
|
Harald Hoyer |
7f792c |
+ _nval=$(_dogetargs $1)
|
|
Harald Hoyer |
7f792c |
+ if [ -n "$_nval" ]; then
|
|
Harald Hoyer |
7f792c |
+ if [ -n "$_val" ]; then
|
|
Harald Hoyer |
7f792c |
+ _val="$_val $_nval"
|
|
Harald Hoyer |
7f792c |
+ else
|
|
Harald Hoyer |
7f792c |
+ _val="$_nval"
|
|
Harald Hoyer |
7f792c |
+ fi
|
|
Harald Hoyer |
7f792c |
+ fi
|
|
Harald Hoyer |
7f792c |
shift
|
|
Harald Hoyer |
7f792c |
done
|
|
Harald Hoyer |
7f792c |
if [ -n "$_val" ]; then
|