7f792c
fixed symbolic link creation in the initramfs
|
@@ -0,0 +1,36 @@
|
|
|
1
|
+
From d609c64209af738540f629bccecdef8c6bafa91d Mon Sep 17 00:00:00 2001
|
|
2
|
+
From: Harald Hoyer <harald@redhat.com>
|
|
3
|
+
Date: Wed, 10 Aug 2011 20:03:21 +0200
|
|
4
|
+
Subject: [PATCH] dracut-lib.sh: fixed getargs() for empty arguments
|
|
5
|
+
|
|
6
|
+
---
|
|
7
|
+
modules.d/99base/dracut-lib.sh | 14 +++++++++++---
|
|
8
|
+
1 files changed, 11 insertions(+), 3 deletions(-)
|
|
9
|
+
|
|
10
|
+
diff --git a/modules.d/99base/dracut-lib.sh b/modules.d/99base/dracut-lib.sh
|
|
11
|
+
index 80c1f84..dec5d92 100755
|
|
12
|
+
--- a/modules.d/99base/dracut-lib.sh
|
|
13
|
+
+++ b/modules.d/99base/dracut-lib.sh
|
|
14
|
+
@@ -142,11 +142,19 @@ _dogetargs() {
|
|
15
|
+
}
|
|
16
|
+
|
|
17
|
+
getargs() {
|
|
18
|
+
- local _val
|
|
19
|
+
- unset _val
|
|
20
|
+
set +x
|
|
21
|
+
+ local _val _nval
|
|
22
|
+
+ unset _val
|
|
23
|
+
+ unset _nval
|
|
24
|
+
while [ $# -gt 0 ]; do
|
|
25
|
+
- _val="$_val $(_dogetargs $1)"
|
|
26
|
+
+ _nval=$(_dogetargs $1)
|
|
27
|
+
+ if [ -n "$_nval" ]; then
|
|
28
|
+
+ if [ -n "$_val" ]; then
|
|
29
|
+
+ _val="$_val $_nval"
|
|
30
|
+
+ else
|
|
31
|
+
+ _val="$_nval"
|
|
32
|
+
+ fi
|
|
33
|
+
+ fi
|
|
34
|
+
shift
|
|
35
|
+
done
|
|
36
|
+
if [ -n "$_val" ]; then
|
|
@@ -8,7 +8,7 @@
|
|
|
8
8
|
|
|
9
9
|
Name: dracut
|
|
10
10
|
Version: 011
|
|
11
|
-
Release:
|
|
11
|
+
Release: 41.git20110810
|
|
12
12
|
|
|
13
13
|
Summary: Initramfs generator using udev
|
|
14
14
|
%if 0%{?fedora}
|
|
@@ -61,7 +61,7 @@ Patch36: 0036-dracut.spec-add-97masterkey-98ecryptfs-98integrity.patch
|
|
|
61
61
|
Patch37: 0037-dracut-functions-create-relative-symlinks-for-librar.patch
|
|
62
62
|
Patch38: 0038-99base-init-use-udevadm-control-to-set-the-logging-p.patch
|
|
63
63
|
Patch39: 0039-dracut-lib.sh-getarg-echo-with-to-prevent-wildcard-s.patch
|
|
64
|
-
|
|
64
|
+
Patch40: 0040-dracut-lib.sh-fixed-getargs-for-empty-arguments.patch
|
|
65
65
|
|
|
66
66
|
BuildArch: noarch
|
|
67
67
|
BuildRequires: dash bash
|
|
@@ -234,7 +234,7 @@ This package contains tools to assemble the local initrd and host configuration.
|
|
|
234
234
|
%patch37 -p1
|
|
235
235
|
%patch38 -p1
|
|
236
236
|
%patch39 -p1
|
|
237
|
-
|
|
237
|
+
%patch40 -p1
|
|
238
238
|
|
|
239
239
|
%build
|
|
240
240
|
make
|
|
@@ -368,6 +368,9 @@ rm -rf $RPM_BUILD_ROOT
|
|
|
368
368
|
%dir /var/lib/dracut/overlay
|
|
369
369
|
|
|
370
370
|
%changelog
|
|
371
|
+
* Wed Aug 10 2011 Harald Hoyer <harald@redhat.com> 011-41.git20110810
|
|
372
|
+
- fixed getargs() for empty args
|
|
373
|
+
|
|
371
374
|
* Wed Aug 10 2011 Harald Hoyer <harald@redhat.com> 011-40.git20110810
|
|
372
375
|
- fixed symbolic link creation in the initramfs
|
|
373
376
|
Resolves: rhbz#728863
|