From 9a2de6cad5f39a76b7a19af49b1ab735822a1e95 Mon Sep 17 00:00:00 2001 From: openoms <43343391+openoms@users.noreply.github.com> Date: Wed, 3 Jul 2024 16:32:37 +0200 Subject: [PATCH] update amd64 base image to debian-12.6.0-amd64-netinst.iso (#4637) * update amd64 base image to debian-12.6.0-amd64-netinst.iso * add resolvconf and nameservers for the amd64 build --- CHANGES.md | 1 + ci/amd64/debian/build.amd64-debian.pkr.hcl | 4 ++-- ci/amd64/debian/scripts/networking.sh | 13 +++++++++---- 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index 973d2bf23..f99710145 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -2,6 +2,7 @@ - New: Set Timezone SSHMENU > SYSTEM > TIME [details](https://github.com/raspiblitz/raspiblitz/issues/1712) - New: Labelbase 2.2.1 [details](https://x.com/labelbase_space) +- Update: amd64 base image: debian-12.6.0-amd64-netinst.iso - Update: LNbits 0.12.8 [details](https://github.com/lnbits/lnbits/releases/tag/0.12.8) - Update: Specter Desktop 2.0.4 with reactivated UPDATE option [details](https://github.com/cryptoadvance/specter-desktop/releases/tag/v2.0.4) - Update: BTCPayServer 1.13.0 [details](https://github.com/btcpayserver/btcpayserver/releases/tag/v1.13.0) diff --git a/ci/amd64/debian/build.amd64-debian.pkr.hcl b/ci/amd64/debian/build.amd64-debian.pkr.hcl index d42f688d4..7bcdbfcbb 100644 --- a/ci/amd64/debian/build.amd64-debian.pkr.hcl +++ b/ci/amd64/debian/build.amd64-debian.pkr.hcl @@ -1,5 +1,5 @@ -variable "iso_name" { default = "debian-12.5.0-amd64-netinst.iso" } -variable "iso_checksum" { default = "013f5b44670d81280b5b1bc02455842b250df2f0c6763398feb69af1a805a14f" } +variable "iso_name" { default = "debian-12.6.0-amd64-netinst.iso" } +variable "iso_checksum" { default = "ade3a4acc465f59ca2496344aab72455945f3277a52afc5a2cae88cdc370fa12" } variable "pack" { default = "lean" } variable "github_user" { default = "raspiblitz" } diff --git a/ci/amd64/debian/scripts/networking.sh b/ci/amd64/debian/scripts/networking.sh index a574c6900..26f72814f 100644 --- a/ci/amd64/debian/scripts/networking.sh +++ b/ci/amd64/debian/scripts/networking.sh @@ -1,9 +1,14 @@ #!/bin/sh -eux # Disable Predictable Network Interface names and use eth0 -sed -i 's/en[[:alnum:]]*/eth0/g' /etc/network/interfaces; -sed -i 's/GRUB_CMDLINE_LINUX="\(.*\)"/GRUB_CMDLINE_LINUX="net.ifnames=0 biosdevname=0 \1"/g' /etc/default/grub; -update-grub; +sed -i 's/en[[:alnum:]]*/eth0/g' /etc/network/interfaces +sed -i 's/GRUB_CMDLINE_LINUX="\(.*\)"/GRUB_CMDLINE_LINUX="net.ifnames=0 biosdevname=0 \1"/g' /etc/default/grub +update-grub # Adding a 2 sec delay to the interface up, to make the dhclient happy -echo "pre-up sleep 2" >> /etc/network/interfaces +echo "pre-up sleep 2" >>/etc/network/interfaces + +# needed for resolvconf installed in build_sdcard.sh +apt-get install resolvconf -y +echo 'nameserver 1.1.1.1' >/etc/resolv.conf +echo 'nameserver 8.8.8.8' >>/etc/resolv.conf