[gentoo-commits] repo/gentoo:master commit in: app-containers/lxd/, app-containers/lxd/files/

["Joonas Niilola" <juippis@gentoo.org>]

commit:     5a48ee50d19a4ed58b32bbe35b6246a1c295ae7e
Author:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 20 06:34:46 2022 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Sun Feb 20 06:34:46 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5a48ee50

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 <AT> gentoo.org>

 app-containers/lxd/files/{lxd-4.0.9.service => lxd-4.0.9-r1.service} | 2 --
 app-containers/lxd/{lxd-4.0.9-r1.ebuild => lxd-4.0.9-r2.ebuild}      | 2 +-
 2 files changed, 1 insertion(+), 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
similarity index 96%
rename from app-containers/lxd/files/lxd-4.0.9.service
rename to 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
similarity index 98%
rename from app-containers/lxd/lxd-4.0.9-r1.ebuild
rename to 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' \