gentoo-mirror/gentoo
1
0
Fork 0
mirror of https://github.com/gentoo-mirror/gentoo.git synced 2026-01-06 02:17:34 -08:00
Code Issues Projects Releases Wiki Activity

app-containers/incus: fix the previous attempt at systemd service files

Browse Source 
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@gentoo.org>
This commit is contained in:
Joonas Niilola 2025-07-15 19:17:44 +03:00
parent 39b61680aa
commit 3926111315
No known key found for this signature in database
GPG Key ID: 7383942B8DC06962
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app-containers/incus/files/incus-6.14.service → app-containers/incus/files/incus-6.14-r1.service
View File

@ -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

2
app-containers/incus/incus-6.14-r3.ebuild → app-containers/incus/incus-6.14-r4.ebuild
View File

@ -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' \