| 1 |
commit: 5a48ee50d19a4ed58b32bbe35b6246a1c295ae7e |
| 2 |
Author: Joonas Niilola <juippis <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Feb 20 06:34:46 2022 +0000 |
| 4 |
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Feb 20 06:34:46 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5a48ee50 |
| 7 |
|
| 8 |
app-containers/lxd: fix systemd service file for 4.0.9 |
| 9 |
|
| 10 |
- the previous settings caused some runtime issues, with apparently |
| 11 |
mixed process ownerships. |
| 12 |
|
| 13 |
Reported-by: telans |
| 14 |
Thanks-to: telans |
| 15 |
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org> |
| 16 |
|
| 17 |
app-containers/lxd/files/{lxd-4.0.9.service => lxd-4.0.9-r1.service} | 2 -- |
| 18 |
app-containers/lxd/{lxd-4.0.9-r1.ebuild => lxd-4.0.9-r2.ebuild} | 2 +- |
| 19 |
2 files changed, 1 insertion(+), 3 deletions(-) |
| 20 |
|
| 21 |
diff --git a/app-containers/lxd/files/lxd-4.0.9.service b/app-containers/lxd/files/lxd-4.0.9-r1.service |
| 22 |
similarity index 96% |
| 23 |
rename from app-containers/lxd/files/lxd-4.0.9.service |
| 24 |
rename to app-containers/lxd/files/lxd-4.0.9-r1.service |
| 25 |
index 6a218d2c43a7..480940dab7a3 100644 |
| 26 |
--- a/app-containers/lxd/files/lxd-4.0.9.service |
| 27 |
+++ b/app-containers/lxd/files/lxd-4.0.9-r1.service |
| 28 |
@@ -5,8 +5,6 @@ Requires=network-online.target lxcfs.service lxd.socket |
| 29 |
Documentation=man:lxd(1) |
| 30 |
|
| 31 |
[Service] |
| 32 |
-Group=lxd |
| 33 |
-User=root |
| 34 |
EnvironmentFile=-/etc/environment |
| 35 |
ExecStart=/usr/sbin/lxd --group lxd --syslog |
| 36 |
ExecStartPost=/usr/sbin/lxd waitready --timeout=600 |
| 37 |
|
| 38 |
diff --git a/app-containers/lxd/lxd-4.0.9-r1.ebuild b/app-containers/lxd/lxd-4.0.9-r2.ebuild |
| 39 |
similarity index 98% |
| 40 |
rename from app-containers/lxd/lxd-4.0.9-r1.ebuild |
| 41 |
rename to app-containers/lxd/lxd-4.0.9-r2.ebuild |
| 42 |
index 999b833af717..83a03cabf801 100644 |
| 43 |
--- a/app-containers/lxd/lxd-4.0.9-r1.ebuild |
| 44 |
+++ b/app-containers/lxd/lxd-4.0.9-r2.ebuild |
| 45 |
@@ -99,7 +99,7 @@ src_prepare() { |
| 46 |
lxd/apparmor/instance_qemu.go \ |
| 47 |
lxd/instance/drivers/driver_qemu.go || die "Failed to fix hardcoded ovmf paths." |
| 48 |
|
| 49 |
- cp "${FILESDIR}"/lxd-4.0.9.service "${T}"/lxd.service || die |
| 50 |
+ cp "${FILESDIR}"/lxd-4.0.9-r1.service "${T}"/lxd.service || die |
| 51 |
if use apparmor; then |
| 52 |
sed -i \ |
| 53 |
'/^EnvironmentFile=.*/a ExecStartPre=\/usr\/libexec\/lxc\/lxc-apparmor-load' \ |
Archives