From 1023469447ef337993d22f59c13da4bdfc04bcc7b68650a43f2c82c64a6760c5 Mon Sep 17 00:00:00 2001 From: e-minguez Date: Mon, 1 Dec 2025 11:39:44 +0100 Subject: [PATCH] feat: Include the EIB elemental fix temporary for 3.4 --- edge-image-builder-image/Dockerfile | 8 +++---- .../0001-eib-elemental-reset-fix.patch | 24 +++++++++++++++++++ edge-image-builder/edge-image-builder.spec | 3 ++- 3 files changed, 30 insertions(+), 5 deletions(-) create mode 100644 edge-image-builder/0001-eib-elemental-reset-fix.patch diff --git a/edge-image-builder-image/Dockerfile b/edge-image-builder-image/Dockerfile index 392138b..6a7e0ea 100644 --- a/edge-image-builder-image/Dockerfile +++ b/edge-image-builder-image/Dockerfile @@ -1,5 +1,5 @@ -#!BuildTag: %%IMG_PREFIX%%edge-image-builder:1.3.0 -#!BuildTag: %%IMG_PREFIX%%edge-image-builder:1.3.0-%RELEASE% +#!BuildTag: %%IMG_PREFIX%%edge-image-builder:1.3.0.1 +#!BuildTag: %%IMG_PREFIX%%edge-image-builder:1.3.0.1-%RELEASE% ARG SLE_VERSION FROM registry.suse.com/bci/bci-base:$SLE_VERSION MAINTAINER SUSE LLC (https://www.suse.com/) @@ -14,11 +14,11 @@ RUN zypper --non-interactive install --no-recommends edge-image-builder qemu-x86 LABEL org.opencontainers.image.authors="SUSE LLC (https://www.suse.com/)" LABEL org.opencontainers.image.title="SLE edge-image-builder Container Image" LABEL org.opencontainers.image.description="edge-image-builder based on the SLE Base Container Image." -LABEL org.opencontainers.image.version="1.3.0" +LABEL org.opencontainers.image.version="1.3.0.1" LABEL org.opencontainers.image.url="https://www.suse.com/products/server/" LABEL org.opencontainers.image.created="%BUILDTIME%" LABEL org.opencontainers.image.vendor="SUSE LLC" -LABEL org.opensuse.reference="%%IMG_REPO%%/%%IMG_PREFIX%%edge-image-builder:1.3.0-%RELEASE%" +LABEL org.opensuse.reference="%%IMG_REPO%%/%%IMG_PREFIX%%edge-image-builder:1.3.0.1-%RELEASE%" LABEL org.openbuildservice.disturl="%DISTURL%" LABEL com.suse.supportlevel="%%SUPPORT_LEVEL%%" LABEL com.suse.eula="SUSE Combined EULA February 2024" diff --git a/edge-image-builder/0001-eib-elemental-reset-fix.patch b/edge-image-builder/0001-eib-elemental-reset-fix.patch new file mode 100644 index 0000000..69a5aed --- /dev/null +++ b/edge-image-builder/0001-eib-elemental-reset-fix.patch @@ -0,0 +1,24 @@ +From 643bcd634310909d01e1365cf5f3aaac98f25414 Mon Sep 17 00:00:00 2001 +From: Eduardo Minguez +Date: Tue, 11 Nov 2025 17:10:01 +0100 +Subject: [PATCH] Fix #808 + +--- + pkg/combustion/templates/31-elemental-register.sh.tpl | 2 ++ + 1 files changed, 2 insertions(+) + +diff --git a/pkg/combustion/templates/31-elemental-register.sh.tpl b/pkg/combustion/templates/31-elemental-register.sh.tpl +index c1ff4337..91f8b4c2 100644 +--- a/pkg/combustion/templates/31-elemental-register.sh.tpl ++++ b/pkg/combustion/templates/31-elemental-register.sh.tpl +@@ -20,8 +20,10 @@ WantedBy=network-online.target + [Service] + EnvironmentFile=-/etc/sysconfig/proxy + Type=oneshot ++ExecStartPre=/usr/bin/mkdir -p /etc/rancher/elemental/agent + ExecStart=/usr/sbin/elemental-register --debug --config-path /etc/elemental/config.yaml --state-path /etc/elemental/state.yaml --install --no-toolkit + ExecStartPost=/usr/bin/cp /var/lib/elemental/agent/elemental_connection.json /etc/rancher/elemental/agent ++ExecStartPost=/usr/bin/systemctl restart elemental-system-agent.service + Restart=on-failure + RestartSec=10 + EOF diff --git a/edge-image-builder/edge-image-builder.spec b/edge-image-builder/edge-image-builder.spec index 0da621b..9a4dc7a 100644 --- a/edge-image-builder/edge-image-builder.spec +++ b/edge-image-builder/edge-image-builder.spec @@ -24,6 +24,7 @@ License: Apache-2.0 URL: https://github.com/suse-edge/edge-image-builder Source: edge-image-builder-%{version}.tar Source1: vendor.tar.gz +Patch: 0001-eib-elemental-reset-fix.patch BuildRequires: golang(API) go1.24 BuildRequires: golang-packaging BuildRequires: gpgme-devel @@ -52,7 +53,7 @@ Requires: ca-certificates-suse Tool for creating and configuring a set of images to automate the deployment of Edge environments %prep -%autosetup -a1 -n edge-image-builder-%{version} +%autosetup -a1 -n edge-image-builder-%{version} -p1 %build tar -xf %{SOURCE1} -- 2.51.1