summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoonas Niilola <juippis@gentoo.org>2022-02-20 08:34:46 +0200
committerJoonas Niilola <juippis@gentoo.org>2022-02-20 08:34:46 +0200
commit5a48ee50d19a4ed58b32bbe35b6246a1c295ae7e (patch)
treec4edbca6525d42ce1de4e64071dae9b7f8cdcb20 /app-containers
parentnet-analyzer/wireshark: drop 3.4.10, 3.6.0-r1 (diff)
downloadgentoo-5a48ee50d19a4ed58b32bbe35b6246a1c295ae7e.tar.gz
gentoo-5a48ee50d19a4ed58b32bbe35b6246a1c295ae7e.tar.bz2
gentoo-5a48ee50d19a4ed58b32bbe35b6246a1c295ae7e.zip
app-containers/lxd: fix systemd service file for 4.0.9
- the previous settings caused some runtime issues, with apparently mixed process ownerships. Reported-by: telans Thanks-to: telans Signed-off-by: Joonas Niilola <juippis@gentoo.org>
Diffstat (limited to 'app-containers')
-rw-r--r--app-containers/lxd/files/lxd-4.0.9-r1.service (renamed from app-containers/lxd/files/lxd-4.0.9.service)2
-rw-r--r--app-containers/lxd/lxd-4.0.9-r2.ebuild (renamed from app-containers/lxd/lxd-4.0.9-r1.ebuild)2
2 files changed, 1 insertions, 3 deletions
diff --git a/app-containers/lxd/files/lxd-4.0.9.service b/app-containers/lxd/files/lxd-4.0.9-r1.service
index 6a218d2c43a7..480940dab7a3 100644
--- a/app-containers/lxd/files/lxd-4.0.9.service
+++ b/app-containers/lxd/files/lxd-4.0.9-r1.service
@@ -5,8 +5,6 @@ Requires=network-online.target lxcfs.service lxd.socket
Documentation=man:lxd(1)
[Service]
-Group=lxd
-User=root
EnvironmentFile=-/etc/environment
ExecStart=/usr/sbin/lxd --group lxd --syslog
ExecStartPost=/usr/sbin/lxd waitready --timeout=600
diff --git a/app-containers/lxd/lxd-4.0.9-r1.ebuild b/app-containers/lxd/lxd-4.0.9-r2.ebuild
index 999b833af717..83a03cabf801 100644
--- a/app-containers/lxd/lxd-4.0.9-r1.ebuild
+++ b/app-containers/lxd/lxd-4.0.9-r2.ebuild
@@ -99,7 +99,7 @@ src_prepare() {
lxd/apparmor/instance_qemu.go \
lxd/instance/drivers/driver_qemu.go || die "Failed to fix hardcoded ovmf paths."
- cp "${FILESDIR}"/lxd-4.0.9.service "${T}"/lxd.service || die
+ cp "${FILESDIR}"/lxd-4.0.9-r1.service "${T}"/lxd.service || die
if use apparmor; then
sed -i \
'/^EnvironmentFile=.*/a ExecStartPre=\/usr\/libexec\/lxc\/lxc-apparmor-load' \