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.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 428F0138359 for ; Mon, 13 Jul 2020 07:16:22 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 878C1E08A4; Mon, 13 Jul 2020 07:16:21 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 6F7F1E08A4 for ; Mon, 13 Jul 2020 07:16:21 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 6710F34F491 for ; Mon, 13 Jul 2020 07:16:20 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 0FE8C27F for ; Mon, 13 Jul 2020 07:16:16 +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: <1594624559.cbde434758c938aa1452aa31818fcb3b8fd73245.juippis@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-fs/lxcfs/, sys-fs/lxcfs/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-fs/lxcfs/files/lxcfs-4.0.0.service sys-fs/lxcfs/lxcfs-4.0.4-r1.ebuild sys-fs/lxcfs/lxcfs-4.0.4-r2.ebuild X-VCS-Directories: sys-fs/lxcfs/files/ sys-fs/lxcfs/ X-VCS-Committer: juippis X-VCS-Committer-Name: Joonas Niilola X-VCS-Revision: cbde434758c938aa1452aa31818fcb3b8fd73245 X-VCS-Branch: master Date: Mon, 13 Jul 2020 07:16:16 +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: 08bdcb73-ffba-4f8a-a2f7-77c1b31768ef X-Archives-Hash: 3f7387743c6cdf33516b4c80eb1b8c91 commit: cbde434758c938aa1452aa31818fcb3b8fd73245 Author: Joonas Niilola gentoo org> AuthorDate: Mon Jul 13 06:17:59 2020 +0000 Commit: Joonas Niilola gentoo org> CommitDate: Mon Jul 13 07:15:59 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cbde4347 sys-fs/lxcfs: systemd related fixes, #732364 Closes: https://bugs.gentoo.org/732364 Signed-off-by: Joonas Niilola gentoo.org> sys-fs/lxcfs/files/lxcfs-4.0.0.service | 18 ++++++++++++++++++ .../{lxcfs-4.0.4-r1.ebuild => lxcfs-4.0.4-r2.ebuild} | 2 +- 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/sys-fs/lxcfs/files/lxcfs-4.0.0.service b/sys-fs/lxcfs/files/lxcfs-4.0.0.service new file mode 100644 index 00000000000..0bdab880a79 --- /dev/null +++ b/sys-fs/lxcfs/files/lxcfs-4.0.0.service @@ -0,0 +1,18 @@ +[Unit] +Description=FUSE filesystem for LXC +ConditionVirtualization=!container +Before=lxc.service +Documentation=man:lxcfs(1) + +[Service] +ExecStartPre=/sbin/modprobe -q fuse +ExecStartPre=install -d /var/lib/lxcfs +ExecStart=/usr/bin/lxcfs /var/lib/lxcfs +KillMode=process +Restart=on-failure +ExecStopPost=-/usr/bin/fusermount -u /var/lib/lxcfs +Delegate=yes +ExecReload=/bin/kill -USR1 ${MAINPID} + +[Install] +WantedBy=multi-user.target diff --git a/sys-fs/lxcfs/lxcfs-4.0.4-r1.ebuild b/sys-fs/lxcfs/lxcfs-4.0.4-r2.ebuild similarity index 94% rename from sys-fs/lxcfs/lxcfs-4.0.4-r1.ebuild rename to sys-fs/lxcfs/lxcfs-4.0.4-r2.ebuild index 583ac4fcfa6..ad87ebdf52b 100644 --- a/sys-fs/lxcfs/lxcfs-4.0.4-r1.ebuild +++ b/sys-fs/lxcfs/lxcfs-4.0.4-r2.ebuild @@ -47,5 +47,5 @@ src_install() { # Provide our own service file (copy of upstream) due to paths being different from upstream, # 728470 - systemd_dounit "${FILESDIR}"/lxcfs.service + systemd_newunit "${FILESDIR}"/lxcfs-4.0.0.service lxcfs.service }