diff --git a/repro.in b/repro.in index f65f7c2..7ce2528 100755 --- a/repro.in +++ b/repro.in @@ -15,12 +15,11 @@ BUILDDIRECTORY=/var/lib/repro KEYRINGCACHE="${BUILDDIRECTORY}/keyring" -IMG_RELEASE_TIMESTAMP="$(date -d '24 hours ago' -u +%Y.%m)".01 -BOOTSTRAPMIRROR="https://europe.mirror.pkgbuild.com/iso/$IMG_RELEASE_TIMESTAMP" -readonly bootstrap_img=archlinux-bootstrap-"$IMG_RELEASE_TIMESTAMP"-"$(uname -m)".tar.gz +BOOTSTRAPMIRROR="https://geo.mirror.pkgbuild.com/iso/latest" +readonly bootstrap_img=archlinux-bootstrap-"$(uname -m)".tar.gz CONFIGDIR='REPRO_CONFIG_DIR' -HOSTMIRROR="https://europe.mirror.pkgbuild.com/\$repo/os/\$arch" +HOSTMIRROR="https://geo.mirror.pkgbuild.com/\$repo/os/\$arch" ARCHIVEURL="${ARCH_ARCHIVE_CACHE:-https://archive.archlinux.org/packages}" @@ -433,7 +432,7 @@ __END__ # shellcheck disable=SC2086 keyring=$(printf -- '%s\n' ${packages[*]} | grep -E "archlinux-keyring") EPHEMERAL=1 exec_nspawn root --bind="${build_root_dir}:/mnt" --bind="$(readlink -e "${cachedir}"):/cache" bash -c \ - 'pacstrap -U /mnt "$@"' -bash "${keyring}" &>/dev/null + 'pacstrap -U /mnt -dd "$@"' -bash "${keyring}" &>/dev/null mkdir -p "$KEYRINGCACHE/$keyring_package" trap "{ rm -rf $KEYRINGCACHE/$keyring_package ; exit 1; }" ERR INT