commit:     cbde434758c938aa1452aa31818fcb3b8fd73245
Author:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 13 06:17:59 2020 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> 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 <juippis <AT> 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
 }

Reply via email to