030-lxc-download.patch (1570B)
1 --- a/templates/lxc-download.in 2 +++ b/templates/lxc-download.in 3 @@ -39,7 +39,7 @@ DOWNLOAD_LIST_IMAGES="false" 4 DOWNLOAD_MODE="system" 5 DOWNLOAD_READY_GPG="false" 6 DOWNLOAD_RELEASE= 7 -DOWNLOAD_SERVER="images.linuxcontainers.org" 8 +DOWNLOAD_SERVER="virtualwrt.org/containers/" 9 DOWNLOAD_SHOW_GPG_WARNING="true" 10 DOWNLOAD_SHOW_HTTP_WARNING="true" 11 DOWNLOAD_TARGET="system" 12 @@ -257,14 +257,6 @@ for bin in tar xz wget; do 13 fi 14 done 15 16 -# Check for GPG 17 -if [ "$DOWNLOAD_VALIDATE" = "true" ]; then 18 - if ! type gpg >/dev/null 2>&1; then 19 - echo "ERROR: Missing recommended tool: gpg" 1>&2 20 - echo "You can workaround this by using --no-validate." 1>&2 21 - exit 1 22 - fi 23 -fi 24 25 # Check that we have all variables we need 26 if [ -z "$LXC_NAME" ] || [ -z "$LXC_PATH" ] || [ -z "$LXC_ROOTFS" ]; then 27 @@ -456,16 +448,9 @@ if [ "$DOWNLOAD_USE_CACHE" = "false" ]; 28 echo "Downloading the rootfs" 29 download_file $DOWNLOAD_URL/rootfs.tar.xz \ 30 ${DOWNLOAD_TEMP}/rootfs.tar.xz normal 31 - download_sig $DOWNLOAD_URL/rootfs.tar.xz.asc \ 32 - ${DOWNLOAD_TEMP}/rootfs.tar.xz.asc normal 33 - gpg_validate ${DOWNLOAD_TEMP}/rootfs.tar.xz.asc 34 - 35 echo "Downloading the metadata" 36 download_file $DOWNLOAD_URL/meta.tar.xz \ 37 ${DOWNLOAD_TEMP}/meta.tar.xz normal 38 - download_sig $DOWNLOAD_URL/meta.tar.xz.asc \ 39 - ${DOWNLOAD_TEMP}/meta.tar.xz.asc normal 40 - gpg_validate ${DOWNLOAD_TEMP}/meta.tar.xz.asc 41 42 if [ -d $LXC_CACHE_PATH ]; then 43 rm -Rf $LXC_CACHE_PATH