From 0a5426302d52cf75e6b80fcbe5a495ce73e33ac0 Mon Sep 17 00:00:00 2001 From: Eugene Blikh Date: Tue, 19 May 2026 12:18:46 +0300 Subject: [PATCH] =?UTF-8?q?patches:=20ubuntu/genimg=20=E2=80=94=20correct?= =?UTF-8?q?=20context=20lines=20for=20the=20network=20hunk?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The previous version had stale context (EOF / fi / DHCP=yes) that didn't match the actual recipe. Replace with the real surrounding lines (resolv.conf nameservers above, Address=10.0.2.15/24 below) so `patch -p0` applies cleanly on a fresh apk recipe tree. --- patches/builds-images-ubuntu-genimg.patch | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/patches/builds-images-ubuntu-genimg.patch b/patches/builds-images-ubuntu-genimg.patch index b598d1329f38688bca647d965611380831a0b843..25e27cbe186690fd63e80595d7aaa7a8388fe070 100644 --- a/patches/builds-images-ubuntu-genimg.patch +++ b/patches/builds-images-ubuntu-genimg.patch @@ -43,9 +43,9 @@ Apply when refreshing the apk recipe tree on the image-builder host: if [ "$arch" = "amd64" ] @@ -85,9 +86,9 @@ - EOF - fi - + rm -f /mnt/etc/resolv.conf + echo 'nameserver 8.8.8.8' >/mnt/etc/resolv.conf + echo 'nameserver 8.8.4.4' >>/mnt/etc/resolv.conf -cat >/mnt/etc/systemd/network/25-ens3.network </mnt/etc/systemd/network/25-ethernet.network <