commit: 3926111315679d71469faafbfdda41e55f59546c
Author: Joonas Niilola <juippis <AT> gentoo <DOT> org>
AuthorDate: Tue Jul 15 16:17:44 2025 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Tue Jul 15 16:19:37 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=39261113
app-containers/incus: fix the previous attempt at systemd service files
Apparently "PassEnvironment" didn't work as planned, do the "Plan B" instead and
just point EnvironmentFile at the /etc/env.d/90incus file.
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
.../incus/files/{incus-6.14.service => incus-6.14-r1.service} | 2 +-
app-containers/incus/{incus-6.14-r3.ebuild => incus-6.14-r4.ebuild} | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/app-containers/incus/files/incus-6.14.service
b/app-containers/incus/files/incus-6.14-r1.service
similarity index 92%
rename from app-containers/incus/files/incus-6.14.service
rename to app-containers/incus/files/incus-6.14-r1.service
index dc9a3385fe52..e356a9e6d700 100644
--- a/app-containers/incus/files/incus-6.14.service
+++ b/app-containers/incus/files/incus-6.14-r1.service
@@ -9,7 +9,7 @@ ExecStartPost=/usr/sbin/incusd waitready --timeout=600
ExecStartPre=/bin/mkdir -p /var/log/incus
ExecStartPre=/bin/chown -R root:incus-admin /var/log/incus
KillMode=process
-PassEnvironment=INCUS_AGENT_PATH INCUS_EDK2_PATH
+EnvironmentFile=/etc/env.d/90incus
PermissionsStartOnly=true
TimeoutStartSec=600s
TimeoutStopSec=30s
diff --git a/app-containers/incus/incus-6.14-r3.ebuild
b/app-containers/incus/incus-6.14-r4.ebuild
similarity index 99%
rename from app-containers/incus/incus-6.14-r3.ebuild
rename to app-containers/incus/incus-6.14-r4.ebuild
index 735251e517b3..1d5e859cd2f8 100644
--- a/app-containers/incus/incus-6.14-r3.ebuild
+++ b/app-containers/incus/incus-6.14-r4.ebuild
@@ -116,7 +116,7 @@ src_prepare() {
-e "s:OVMF_VARS.ms.fd:OVMF_VARS.fd:g" \
internal/server/instance/drivers/edk2/driver_edk2.go || die
"Failed to fix hardcoded ovmf paths."
- cp "${FILESDIR}"/incus-6.14.service "${T}"/incus.service || die
+ cp "${FILESDIR}"/incus-6.14-r1.service "${T}"/incus.service || die
if use apparmor; then
sed -i \
'/^EnvironmentFile=.*/a
ExecStartPre=\/usr\/libexec\/lxc\/lxc-apparmor-load' \
