From dc0f693812fd40be5c7a9be76fae0f6ee5905b78 Mon Sep 17 00:00:00 2001 From: sim Date: Sun, 29 Jun 2025 17:11:40 +0200 Subject: [PATCH 1/2] Fix relative symlinks to /usr Some config files are relative links to /usr, like 20-systemd-ssh-proxy.conf. These relative links are broken in /usr/share/factory/etc unless /usr is linked to /usr/share/factory/usr --- mkosi.finalize | 1 + 1 file changed, 1 insertion(+) diff --git a/mkosi.finalize b/mkosi.finalize index 93281c1c..2920bdfc 100755 --- a/mkosi.finalize +++ b/mkosi.finalize @@ -6,3 +6,4 @@ set -e # systemd-tmpfiles to symlink individual directories from it to /etc. mkdir -p "$BUILDROOT/usr/share/factory/" cp --archive --no-target-directory --update=none "$BUILDROOT/etc" "$BUILDROOT/usr/share/factory/etc" +ln -s ../.. "$BUILDROOT/usr/share/factory/usr" From ef59fac67379b83272b746e267d6022ba3cacac3 Mon Sep 17 00:00:00 2001 From: S1m <31284753+p1gp1g@users.noreply.github.com> Date: Mon, 10 Nov 2025 20:03:39 +0100 Subject: [PATCH 2/2] Make relative symlink using full path and `-r` option --- mkosi.finalize | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mkosi.finalize b/mkosi.finalize index 2920bdfc..7b5ae817 100755 --- a/mkosi.finalize +++ b/mkosi.finalize @@ -6,4 +6,4 @@ set -e # systemd-tmpfiles to symlink individual directories from it to /etc. mkdir -p "$BUILDROOT/usr/share/factory/" cp --archive --no-target-directory --update=none "$BUILDROOT/etc" "$BUILDROOT/usr/share/factory/etc" -ln -s ../.. "$BUILDROOT/usr/share/factory/usr" +ln -sr "$BUILDROOT/usr" "$BUILDROOT/usr/share/factory/usr"