From 39dc9c98c687049d060b70a6b5d1a99bc7b35c34 Mon Sep 17 00:00:00 2001
From: Christian Breunig <christian@breunig.cc>
Date: Sat, 28 Feb 2026 19:18:50 +0100
Subject: T8311: fix initramfs hook "dpkg-architecture: command not found"

Commit f4877564276947 ("T8311: De-hardcode arch for live-build-config
10-vyos-addons") introduced a regression where an unavailable third-party
helper script was invoked during initramfs hook execution, breaking the ISO
build process.

  update-initramfs: Generating /boot/initrd.img-6.6.127-vyos
  live-boot: core filesystems devices utils wget blockdev.
  /etc/initramfs-tools/hooks/10-vyos-addons: line 3: dpkg-architecture: command not found

The dpkg-architecture helper, provided by the dpkg-dev package, is not
available during hook execution. The same result can be achieved using GNU
coreutils instead:

On x86_64 (aka amd64) both yield the same result:
  $ echo $(uname -m)-linux-gnu
  x86_64-linux-gnu
  $ echo $(dpkg-architecture -qDEB_HOST_MULTIARCH)
  x86_64-linux-gnu

On aarch64 (aka arm64) both yield the same result:
  $ echo $(uname -m)-linux-gnu
  aarch64-linux-gnu
  $ echo $(dpkg-architecture -qDEB_HOST_MULTIARCH)
  aarch64-linux-gnu
---
 .../includes.chroot/etc/initramfs-tools/hooks/10-vyos-addons            | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'data')

diff --git a/data/live-build-config/includes.chroot/etc/initramfs-tools/hooks/10-vyos-addons b/data/live-build-config/includes.chroot/etc/initramfs-tools/hooks/10-vyos-addons
index 8dac91b5..58b6ed13 100755
--- a/data/live-build-config/includes.chroot/etc/initramfs-tools/hooks/10-vyos-addons
+++ b/data/live-build-config/includes.chroot/etc/initramfs-tools/hooks/10-vyos-addons
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-MULTIARCH="$(dpkg-architecture -qDEB_HOST_MULTIARCH)"
+MULTIARCH="$(uname -m)-linux-gnu"
 PREREQ=""
 prereqs()
 {
-- 
cgit v1.2.3