diff options
Diffstat (limited to 'recipes-containers/lxc/files/templates-use-curl-instead-of-wget.patch')
-rw-r--r-- | recipes-containers/lxc/files/templates-use-curl-instead-of-wget.patch | 23 |
1 files changed, 10 insertions, 13 deletions
diff --git a/recipes-containers/lxc/files/templates-use-curl-instead-of-wget.patch b/recipes-containers/lxc/files/templates-use-curl-instead-of-wget.patch index e9af8335..76704bb3 100644 --- a/recipes-containers/lxc/files/templates-use-curl-instead-of-wget.patch +++ b/recipes-containers/lxc/files/templates-use-curl-instead-of-wget.patch | |||
@@ -14,11 +14,11 @@ Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com> | |||
14 | templates/lxc-download.in | 8 ++++---- | 14 | templates/lxc-download.in | 8 ++++---- |
15 | 1 file changed, 4 insertions(+), 4 deletions(-) | 15 | 1 file changed, 4 insertions(+), 4 deletions(-) |
16 | 16 | ||
17 | diff --git a/templates/lxc-download.in b/templates/lxc-download.in | 17 | Index: git/templates/lxc-download.in |
18 | index a62ddf482..690307338 100755 | 18 | =================================================================== |
19 | --- a/templates/lxc-download.in | 19 | --- git.orig/templates/lxc-download.in |
20 | +++ b/templates/lxc-download.in | 20 | +++ git/templates/lxc-download.in |
21 | @@ -59,9 +59,9 @@ cleanup() { | 21 | @@ -45,9 +45,9 @@ |
22 | fi | 22 | fi |
23 | } | 23 | } |
24 | 24 | ||
@@ -30,16 +30,16 @@ index a62ddf482..690307338 100755 | |||
30 | return 0 | 30 | return 0 |
31 | fi | 31 | fi |
32 | done | 32 | done |
33 | @@ -70,7 +70,7 @@ wget_wrapper() { | 33 | @@ -59,7 +59,7 @@ |
34 | } | 34 | if [ "${DOWNLOAD_VERBOSE}" = "true" ]; then |
35 | 35 | echo "Download file: https://${DOWNLOAD_SERVER}$1" | |
36 | download_file() { | 36 | fi |
37 | - if ! wget_wrapper --user-agent="lxc/@PACKAGE_VERSION@ compat:${DOWNLOAD_COMPAT_LEVEL}" -T 30 -q "https://${DOWNLOAD_SERVER}/$1" -O "$2" >/dev/null 2>&1; then | 37 | - if ! wget_wrapper --user-agent="lxc/@PACKAGE_VERSION@ compat:${DOWNLOAD_COMPAT_LEVEL}" -T 30 -q "https://${DOWNLOAD_SERVER}/$1" -O "$2" >/dev/null 2>&1; then |
38 | + if ! curl_wrapper -L --user-agent "lxc/@PACKAGE_VERSION@ compat:${DOWNLOAD_COMPAT_LEVEL}" -m 30 -s "https://${DOWNLOAD_SERVER}/$1" -o "$2" >/dev/null 2>&1; then | 38 | + if ! curl_wrapper -L --user-agent "lxc/@PACKAGE_VERSION@ compat:${DOWNLOAD_COMPAT_LEVEL}" -m 30 -s "https://${DOWNLOAD_SERVER}/$1" -o "$2" >/dev/null 2>&1; then |
39 | if [ "$3" = "noexit" ]; then | 39 | if [ "$3" = "noexit" ]; then |
40 | return 1 | 40 | return 1 |
41 | else | 41 | else |
42 | @@ -176,7 +176,7 @@ while :; do | 42 | @@ -167,7 +167,7 @@ |
43 | done | 43 | done |
44 | 44 | ||
45 | # Check for required binaries | 45 | # Check for required binaries |
@@ -48,6 +48,3 @@ index a62ddf482..690307338 100755 | |||
48 | if ! command -V "${bin}" >/dev/null 2>&1; then | 48 | if ! command -V "${bin}" >/dev/null 2>&1; then |
49 | echo "ERROR: Missing required tool: ${bin}" 1>&2 | 49 | echo "ERROR: Missing required tool: ${bin}" 1>&2 |
50 | exit 1 | 50 | exit 1 |
51 | -- | ||
52 | 2.25.1 | ||
53 | |||