From 33b89cff72ca486de1296b9edf7453998a16cb6f Mon Sep 17 00:00:00 2001
From: Noel Georgi <git@frezbo.dev>
Date: Sat, 4 Apr 2026 20:53:05 +0300
Subject: [PATCH] feat: allow glibc ld files in etc

Allow both /etc/ld.so.conf and /etc/ld.so.cache files in /etc since tools expect these to be standard.

See: https://github.com/siderolabs/extensions/pull/1031

Replaces changes for Dockerfile from #12909

Signed-off-by: Noel Georgi <git@frezbo.dev>
(cherry picked from commit 414f78a298fc1a196fe310b17b89d3aadc15e1b4)
---
 Dockerfile                             | 4 ----
 pkg/machinery/extensions/extensions.go | 2 ++
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index c9875fca2..7192e607a 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -787,8 +787,6 @@ RUN <<END
     ln -s /usr/local/bin/nvidia-ctk /rootfs/usr/bin/nvidia-ctk
     ln -s /usr/local/bin/nvidia-cdi-hook /rootfs/usr/bin/nvidia-cdi-hook
     ln -s /usr/local/sbin/nvme /rootfs/usr/bin/nvme
-    ln -s ../usr/local/glibc/etc/ld.so.conf /rootfs/etc/ld.so.conf
-    ln -s ../usr/local/glibc/etc/ld.so.cache /rootfs/etc/ld.so.cache
 END
 
 FROM build AS rootfs-base-arm64
@@ -880,8 +878,6 @@ RUN <<END
     ln -s /usr/local/bin/nvidia-ctk /rootfs/usr/bin/nvidia-ctk
     ln -s /usr/local/bin/nvidia-cdi-hook /rootfs/usr/bin/nvidia-cdi-hook
     ln -s /usr/local/sbin/nvme /rootfs/usr/bin/nvme
-    ln -s ../usr/local/glibc/etc/ld.so.conf /rootfs/etc/ld.so.conf
-    ln -s ../usr/local/glibc/etc/ld.so.cache /rootfs/etc/ld.so.cache
 END
 
 FROM build-go AS build-sbom
diff --git a/pkg/machinery/extensions/extensions.go b/pkg/machinery/extensions/extensions.go
index 8e346bdd1..4655f7596 100644
--- a/pkg/machinery/extensions/extensions.go
+++ b/pkg/machinery/extensions/extensions.go
@@ -19,6 +19,8 @@ var AllowedPaths = []string{
 	"/usr/lib/ld-linux-aarch64.so.1",
 	// /sbin/ldconfig is required by the nvidia container toolkit.
 	"/usr/bin/ldconfig",
+	"/etc/ld.so.conf",
+	"/etc/ld.so.cache",
 	"/usr/lib/udev/rules.d",
 	"/usr/local",
 	// glvnd, egl and vulkan are needed for OpenGL/Vulkan.