|
4 | 4 | SCRIPTS_DIR=$(dirname "${BASH_SOURCE[0]}") |
5 | 5 |
|
6 | 6 | source ${SCRIPTS_DIR}/common_iso_generation.sh |
7 | | -source ${SCRIPTS_DIR}/../debian_release.conf |
8 | 7 |
|
9 | 8 | BASE_ISO_NAME="debian-13.5.0-amd64-netinst.iso" |
10 | 9 | BASE_ISO_VERSION="${BASE_ISO_NAME#debian-}" |
11 | 10 | BASE_ISO_VERSION="${BASE_ISO_VERSION%-amd64-netinst.iso}" |
12 | 11 | BASE_ISO_PATH="/images/${BASE_ISO_NAME}" |
13 | | -# Debian serves the newest point release from debian-cd/ and only moves it to the |
14 | | -# archive once it is superseded, so try both. |
15 | | -BASE_ISO_URL="https://cdimage.debian.org/debian-cd/${BASE_ISO_VERSION}/amd64/iso-cd/${BASE_ISO_NAME}" |
16 | | -BASE_ISO_ARCHIVE_URL="https://cdimage.debian.org/mirror/cdimage/archive/${BASE_ISO_VERSION}/amd64/iso-cd/${BASE_ISO_NAME}" |
| 12 | +BASE_ISO_URL="https://cdimage.debian.org/mirror/cdimage/archive/${BASE_ISO_VERSION}/amd64/iso-cd/${BASE_ISO_NAME}" |
17 | 13 | BASE_ISO_SHASUM="95838884f5ea6c82421dfe6baaa5a639dbbe6756c1e380f9fe7a7cb0c1949d2a ${BASE_ISO_PATH}" |
18 | 14 |
|
19 | 15 | DAPPNODE_ISO_NAME="${DAPPNODE_ISO_PREFIX}${BASE_ISO_NAME}" |
20 | 16 | DAPPNODE_ISO_PATH="/images/${DAPPNODE_ISO_NAME}" |
21 | 17 |
|
22 | | -# Fail before downloading or building if the ISO and repositories target different releases. |
23 | | -bash "${SCRIPTS_DIR}/check_debian_release_alignment.sh" |
24 | | - |
25 | 18 | customize_debian_preseed() { |
26 | 19 | local iso_build_path=$1 |
27 | 20 | local workdir=$2 |
@@ -57,13 +50,6 @@ customize_debian_preseed() { |
57 | 50 | exit 1 |
58 | 51 | } |
59 | 52 |
|
60 | | - # Keep package repositories aligned with the Debian release used by the ISO. |
61 | | - sed -i "s/@DEBIAN_SUITE@/${DEBIAN_SUITE}/g" "${tmp_initrd}/preseed.cfg" |
62 | | - if grep -q "@DEBIAN_SUITE@" "${tmp_initrd}/preseed.cfg"; then |
63 | | - echo "[ERROR] Could not render the Debian suite in the preseed file" |
64 | | - exit 1 |
65 | | - fi |
66 | | - |
67 | 53 | # Recreate (and recompress) the initrd |
68 | 54 | (cd "${tmp_initrd}" && find . -print0 | cpio -0 -ov -H newc | gzip >"${install_dir}/initrd.gz") || { |
69 | 55 | echo "[ERROR] Could not create new initrd" |
@@ -101,7 +87,7 @@ generate_debian_iso() { |
101 | 87 | -isohybrid-gpt-basdat -o "${iso_output_path}" ${iso_build_path} |
102 | 88 | } |
103 | 89 |
|
104 | | -download_iso "${BASE_ISO_PATH}" "${BASE_ISO_NAME}" "${BASE_ISO_URL}" "${BASE_ISO_ARCHIVE_URL}" |
| 90 | +download_iso "${BASE_ISO_PATH}" "${BASE_ISO_NAME}" "${BASE_ISO_URL}" |
105 | 91 | verify_download "${BASE_ISO_PATH}" "${BASE_ISO_SHASUM}" |
106 | 92 | clean_old_files "${ISO_BUILD_PATH}" "${DAPPNODE_ISO_PREFIX}" |
107 | 93 | extract_iso "${BASE_ISO_PATH}" "${ISO_BUILD_PATH}" |
|
0 commit comments