diff options
author | Harald Hoyer <harald@redhat.com> | 2013-09-04 13:43:12 +0200 |
---|---|---|
committer | Harald Hoyer <harald@redhat.com> | 2013-09-04 13:43:12 +0200 |
commit | fe48c9c4e590d7ab905da3307e021b9c48545a9a (patch) | |
tree | 29503658db53c8f22eba77857925b7d33936cf2f /0003-url-lib.sh-handle-0-size-files-with-curl.patch | |
parent | b6aad2a9c88b5822b30c1686ce66dd31e2fb1a80 (diff) | |
download | dracut-fe48c9c4e590d7ab905da3307e021b9c48545a9a.tar.gz dracut-fe48c9c4e590d7ab905da3307e021b9c48545a9a.tar.xz dracut-fe48c9c4e590d7ab905da3307e021b9c48545a9a.zip |
dracut-032-23.git20130904
- fixed curl error with zero size kickstart file
Resolves: rhbz#989133
- fixed systemd-cat failure, when systemd is installed
but not actually running
Resolves: rhbz#1002021
- do not fail on empty dracut module directories
Resolves: rhbz#1003153
Diffstat (limited to '0003-url-lib.sh-handle-0-size-files-with-curl.patch')
-rw-r--r-- | 0003-url-lib.sh-handle-0-size-files-with-curl.patch | 23 |
1 files changed, 23 insertions, 0 deletions
diff --git a/0003-url-lib.sh-handle-0-size-files-with-curl.patch b/0003-url-lib.sh-handle-0-size-files-with-curl.patch new file mode 100644 index 0000000..97cf1a0 --- /dev/null +++ b/0003-url-lib.sh-handle-0-size-files-with-curl.patch @@ -0,0 +1,23 @@ +From 5c274467d6a4959b7f451f9a211ffbb38d69b641 Mon Sep 17 00:00:00 2001 +From: Harald Hoyer <harald@redhat.com> +Date: Tue, 20 Aug 2013 16:15:17 +0200 +Subject: [PATCH] url-lib.sh: handle 0-size files with curl + +https://bugzilla.redhat.com/show_bug.cgi?id=989133#c9 +--- + modules.d/45url-lib/url-lib.sh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/modules.d/45url-lib/url-lib.sh b/modules.d/45url-lib/url-lib.sh +index 34d42ba..12df9b4 100755 +--- a/modules.d/45url-lib/url-lib.sh ++++ b/modules.d/45url-lib/url-lib.sh +@@ -64,7 +64,7 @@ curl_fetch_url() { + local url="$1" outloc="$2" + echo "$url" > /proc/self/fd/0 + if [ -n "$outloc" ]; then +- curl $curl_args --output "$outloc" -- "$url" || return $? ++ curl $curl_args --output - -- "$url" > "$outloc" || return $? + else + local outdir="$(mkuniqdir /tmp curl_fetch_url)" + ( cd "$outdir"; curl $curl_args --remote-name "$url" || return $? ) |