From 253d361097cc7bc2249b7044e2f6e614e7903719 Mon Sep 17 00:00:00 2001 From: Jonathan Lebon Date: Thu, 14 Dec 2023 16:49:04 -0500 Subject: [PATCH] app: Tweak tmpfiles.d integration entries for `/usr/local` `systemd-tmpfiles` follows symlinks, so we can write `/usr/local/` here instead of `/var/usrlocal/`. This doesn't matter right now, but will in a future patch where `/usr/local` will no longer be a symlink. --- src/app/rpm-ostree-0-integration.conf | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/src/app/rpm-ostree-0-integration.conf b/src/app/rpm-ostree-0-integration.conf index 1e9822ef29..45ace122c7 100644 --- a/src/app/rpm-ostree-0-integration.conf +++ b/src/app/rpm-ostree-0-integration.conf @@ -3,15 +3,18 @@ d /var/opt 0755 root root - d /var/srv 0755 root root - d /var/roothome 0700 root root - d /var/usrlocal 0755 root root - -d /var/usrlocal/bin 0755 root root - -d /var/usrlocal/etc 0755 root root - -d /var/usrlocal/games 0755 root root - -d /var/usrlocal/include 0755 root root - -d /var/usrlocal/lib 0755 root root - -d /var/usrlocal/man 0755 root root - -d /var/usrlocal/sbin 0755 root root - -d /var/usrlocal/share 0755 root root - -d /var/usrlocal/src 0755 root root - d /var/mnt 0755 root root - d /run/media 0755 root root - L /var/lib/rpm - - - - ../../usr/share/rpm + +# this is normally owned by `filesystem`, but for multiple reasons, this doesn't +# work in the rpm-ostree flow +d /usr/local/bin 0755 root root - +d /usr/local/etc 0755 root root - +d /usr/local/games 0755 root root - +d /usr/local/include 0755 root root - +d /usr/local/lib 0755 root root - +d /usr/local/man 0755 root root - +d /usr/local/sbin 0755 root root - +d /usr/local/share 0755 root root - +d /usr/local/src 0755 root root -