From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 0555515808B for ; Sun, 20 Feb 2022 06:37:55 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 3F09FE07B2; Sun, 20 Feb 2022 06:37:54 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 1E1DFE07B2 for ; Sun, 20 Feb 2022 06:37:54 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id E5B11343998 for ; Sun, 20 Feb 2022 06:37:52 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 64EEA2A4 for ; Sun, 20 Feb 2022 06:37:43 +0000 (UTC) From: "Joonas Niilola" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Joonas Niilola" Message-ID: <1645338886.5a48ee50d19a4ed58b32bbe35b6246a1c295ae7e.juippis@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-containers/lxd/, app-containers/lxd/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-containers/lxd/files/lxd-4.0.9-r1.service app-containers/lxd/files/lxd-4.0.9.service app-containers/lxd/lxd-4.0.9-r1.ebuild app-containers/lxd/lxd-4.0.9-r2.ebuild X-VCS-Directories: app-containers/lxd/ app-containers/lxd/files/ X-VCS-Committer: juippis X-VCS-Committer-Name: Joonas Niilola X-VCS-Revision: 5a48ee50d19a4ed58b32bbe35b6246a1c295ae7e X-VCS-Branch: master Date: Sun, 20 Feb 2022 06:37:43 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 3261b661-677e-4fa6-8c9a-5b4c709f25f8 X-Archives-Hash: 77489388e7127225a380b27c37f1ff16 commit: 5a48ee50d19a4ed58b32bbe35b6246a1c295ae7e Author: Joonas Niilola gentoo org> AuthorDate: Sun Feb 20 06:34:46 2022 +0000 Commit: Joonas Niilola gentoo 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 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' \