From 4d248c7383512368d11cdab2f2b358b03abd9f73 Mon Sep 17 00:00:00 2001 From: Xiangyu Chen Date: Fri, 17 Mar 2023 17:48:35 +0800 Subject: lxc: add -L option for curl in templates-use-curl-instead-of-wget.patch Add support of redirect option for curl, the linuxcontainers.org sometimes redirect to other mirror site such like us.lxd.images.canonical.com, this would cause the lxc-download script report download failed. Reproduce and verified on following command: lxc-create -t download -n test -- --dist archlinux --release current --arch arm64 Signed-off-by: Xiangyu Chen Signed-off-by: Bruce Ashfield --- recipes-containers/lxc/files/templates-use-curl-instead-of-wget.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 ff5c5f65..e9af8335 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 @@ -35,7 +35,7 @@ index a62ddf482..690307338 100755 download_file() { - 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 -+ if ! curl_wrapper --user-agent "lxc/@PACKAGE_VERSION@ compat:${DOWNLOAD_COMPAT_LEVEL}" -m 30 -s "https://${DOWNLOAD_SERVER}/$1" -o "$2" >/dev/null 2>&1; then ++ 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 if [ "$3" = "noexit" ]; then return 1 else -- cgit v1.2.3-54-g00ecf