030-lxc-download.patch 1.5 KB

12345678910111213141516171819202122232425262728293031323334353637383940414243
  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. -# Check for GPG
  16. -if [ "$DOWNLOAD_VALIDATE" = "true" ]; then
  17. - if ! type gpg >/dev/null 2>&1; then
  18. - echo "ERROR: Missing recommended tool: gpg" 1>&2
  19. - echo "You can workaround this by using --no-validate." 1>&2
  20. - exit 1
  21. - fi
  22. -fi
  23. # Check that we have all variables we need
  24. if [ -z "$LXC_NAME" ] || [ -z "$LXC_PATH" ] || [ -z "$LXC_ROOTFS" ]; then
  25. @@ -456,16 +448,9 @@ if [ "$DOWNLOAD_USE_CACHE" = "false" ];
  26. echo "Downloading the rootfs"
  27. download_file $DOWNLOAD_URL/rootfs.tar.xz \
  28. ${DOWNLOAD_TEMP}/rootfs.tar.xz normal
  29. - download_sig $DOWNLOAD_URL/rootfs.tar.xz.asc \
  30. - ${DOWNLOAD_TEMP}/rootfs.tar.xz.asc normal
  31. - gpg_validate ${DOWNLOAD_TEMP}/rootfs.tar.xz.asc
  32. -
  33. echo "Downloading the metadata"
  34. download_file $DOWNLOAD_URL/meta.tar.xz \
  35. ${DOWNLOAD_TEMP}/meta.tar.xz normal
  36. - download_sig $DOWNLOAD_URL/meta.tar.xz.asc \
  37. - ${DOWNLOAD_TEMP}/meta.tar.xz.asc normal
  38. - gpg_validate ${DOWNLOAD_TEMP}/meta.tar.xz.asc
  39. if [ -d $LXC_CACHE_PATH ]; then
  40. rm -Rf $LXC_CACHE_PATH