Merge pull request #322 from Dasharo/develop

Release v2.7.6

Author: DaniilKl

.github/workflows/ci.yml

@@ -124,6 +124,7 @@ jobs:
           ./meta-dts/scripts/generate-ipxe-menu.sh ${{ env.DTS_VER }}
           scp -i ~/.ssh/dts-ci-key dts.ipxe builder@10.1.40.2:boot/dts/
           scp -i ~/.ssh/dts-ci-key dts-rc.ipxe builder@10.1.40.2:boot/dts/
+          scp -i ~/.ssh/dts-ci-key dts-no-fum-fix.ipxe builder@10.1.40.2:boot/dts/
       - name: Trigger signing and deploy to GitHub Release tab
         shell: bash
         run: |

CHANGELOG.md

@@ -4,6 +4,19 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
+## 2.7.6 - 2026-03-02
+
+### Changed
+
+- scripts/generate-ipxe-menu.ipxe: generate iPXE script that skips running FUM
+  workaround application. This script is used in tests.
+
+### Fixed
+
+- recipes-core: systemd: increase USB network metric, so that USB network
+  interface will have lower priorty than non-USB one.
+  Fixes: <https://github.com/Dasharo/dasharo-issues/issues/1289>
+
 ## 2.7.5 - 2026-02-12
 
 ### Added

meta-dts-distro/conf/distro/dts-distro.conf

@@ -4,7 +4,7 @@ DISTRO = "dts-distro"
 
 # distro name
 DISTRO_NAME = "Dasharo Tools Suite"
-DISTRO_VERSION = "2.7.5"
+DISTRO_VERSION = "2.7.6"
 SDK_VENDOR = "-dtssdk"
 
 MAINTAINER = "3mdeb Sp. z o. o. <contact@3mdeb.com>"

meta-dts-distro/recipes-core/systemd/files/usb.network

@@ -0,0 +1,15 @@
+# modified 80-wired.network
+[Match]
+Type=ether
+Name=!veth*
+Driver=rndis_host
+KernelCommandLine=!nfsroot
+KernelCommandLine=!ip
+
+[Network]
+DHCP=yes
+
+[DHCP]
+UseMTU=yes
+RouteMetric=30
+ClientIdentifier=mac

meta-dts-distro/recipes-core/systemd/systemd-conf_%.bbappend

@@ -0,0 +1,9 @@
+FILESEXTRAPATHS:prepend := "${THISDIR}/files:"
+
+SRC_URI:append = " file://usb.network"
+
+do_install:append() {
+    install -D -m0644 ${WORKDIR}/usb.network ${D}${sysconfdir}/systemd/network/50-usb.network
+}
+
+FILES:${PN}:append = " ${sysconfdir}/systemd/network/50-usb.network"

scripts/generate-ipxe-menu.sh

@@ -1,9 +1,44 @@
 #!/usr/bin/env bash
 
+gen_common_ipxe() {
+  local version="$1"
+  cat <<EOF
+#!ipxe
+set dts_version ${version}
+set dts_prefix \${dts_version}
+set path_kernel \${dts_prefix}/bzImage-\${dts_version}
+set path_initrd \${dts_prefix}/dts-base-image-\${dts_version}.cpio.gz
+
+imgfetch --name file_kernel \${path_kernel}
+imgfetch --name file_initrd \${path_initrd}
+
+kernel file_kernel initrd=file_initrd console=ttyUSB0
+EOF
+}
+
+gen_fum_workaround_ipxe() {
+  gen_common_ipxe "$@"
+  cat <<EOF
+
+iseq \${platform} efi && goto is_efi || goto not_efi
+:is_efi
+chain replace_fum_efivar.efi
+
+:not_efi
+boot
+EOF
+}
+
+gen_without_fum_workaround_ipxe() {
+  gen_common_ipxe "$@"
+  echo "boot"
+}
+
 VERSION=$1
 RC_VER_PATTERN="v[0-9]+.[0-9]+.[0-9]+-rc[0-9]+$"
 IPXE_FILE="dts.ipxe"
 IPXE_RC_FILE="dts-rc.ipxe"
+IPXE_NO_FUM_FIX_FILE="dts-no-fum-fix.ipxe"
 
 if [ $# -ne 1 ]; then
   echo "Provide version, e.g. v1.2.3"
@@ -26,25 +61,8 @@ fi
 # imgverify file_kernel \${sig_kernel}
 # imgverify file_initrd \${sig_initrd}
 
-cat <<EOF > "${IPXE_FILE}"
-#!ipxe
-set dts_version ${VERSION}
-set dts_prefix \${dts_version}
-set path_kernel \${dts_prefix}/bzImage-\${dts_version}
-set path_initrd \${dts_prefix}/dts-base-image-\${dts_version}.cpio.gz
-
-imgfetch --name file_kernel \${path_kernel}
-imgfetch --name file_initrd \${path_initrd}
-
-kernel file_kernel initrd=file_initrd console=ttyUSB0
-
-iseq \${platform} efi && goto is_efi || goto not_efi
-:is_efi
-chain replace_fum_efivar.efi
-
-:not_efi
-boot
-EOF
+gen_fum_workaround_ipxe "${VERSION}" >"${IPXE_FILE}"
+gen_without_fum_workaround_ipxe "${VERSION}" >"${IPXE_NO_FUM_FIX_FILE}"
 
 if [ "${IPXE_FILE}" != "${IPXE_RC_FILE}" ]; then
   cp "${IPXE_FILE}" "${IPXE_RC_FILE}"