|
Harald Hoyer |
75f812 |
From 1b8616adeec0e397f8485496d80b70c4368a9c4b Mon Sep 17 00:00:00 2001
|
|
Harald Hoyer |
75f812 |
From: Harald Hoyer <harald@redhat.com>
|
|
Harald Hoyer |
75f812 |
Date: Tue, 28 May 2013 16:15:24 +0200
|
|
Harald Hoyer |
75f812 |
Subject: [PATCH] url-lib/url-lib.sh: turn off curl globbing
|
|
Harald Hoyer |
75f812 |
|
|
Harald Hoyer |
75f812 |
https://bugzilla.redhat.com/show_bug.cgi?id=907497
|
|
Harald Hoyer |
75f812 |
---
|
|
Harald Hoyer |
75f812 |
modules.d/45url-lib/url-lib.sh | 4 ++--
|
|
Harald Hoyer |
75f812 |
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
Harald Hoyer |
75f812 |
|
|
Harald Hoyer |
75f812 |
diff --git a/modules.d/45url-lib/url-lib.sh b/modules.d/45url-lib/url-lib.sh
|
|
Harald Hoyer |
75f812 |
index 4a3d56d..c00ca18 100755
|
|
Harald Hoyer |
75f812 |
--- a/modules.d/45url-lib/url-lib.sh
|
|
Harald Hoyer |
75f812 |
+++ b/modules.d/45url-lib/url-lib.sh
|
|
Harald Hoyer |
75f812 |
@@ -54,7 +54,7 @@ add_url_handler() {
|
|
Harald Hoyer |
75f812 |
|
|
Harald Hoyer |
75f812 |
export CURL_HOME="/run/initramfs/url-lib"
|
|
Harald Hoyer |
75f812 |
mkdir -p $CURL_HOME
|
|
Harald Hoyer |
75f812 |
-curl_args="--location --retry 3 --fail --show-error"
|
|
Harald Hoyer |
75f812 |
+curl_args="--globoff --location --retry 3 --fail --show-error"
|
|
Harald Hoyer |
75f812 |
getargbool 0 rd.noverifyssl && curl_args="$curl_args --insecure"
|
|
Harald Hoyer |
75f812 |
|
|
Harald Hoyer |
75f812 |
proxy=$(getarg proxy=)
|
|
Harald Hoyer |
75f812 |
@@ -64,7 +64,7 @@ curl_fetch_url() {
|
|
Harald Hoyer |
75f812 |
local url="$1" outloc="$2"
|
|
Harald Hoyer |
75f812 |
echo "$url" > /proc/self/fd/0
|
|
Harald Hoyer |
75f812 |
if [ -n "$outloc" ]; then
|
|
Harald Hoyer |
75f812 |
- curl --globoff $curl_args --output "$outloc" "$url" || return $?
|
|
Harald Hoyer |
75f812 |
+ curl $curl_args --output "$outloc" "$url" || return $?
|
|
Harald Hoyer |
75f812 |
else
|
|
Harald Hoyer |
75f812 |
local outdir="$(mkuniqdir /tmp curl_fetch_url)"
|
|
Harald Hoyer |
75f812 |
( cd "$outdir"; curl $curl_args --remote-name "$url" || return $? )
|