summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoonas Niilola <juippis@gentoo.org>2020-07-13 09:17:59 +0300
committerJoonas Niilola <juippis@gentoo.org>2020-07-13 10:15:59 +0300
commitcbde434758c938aa1452aa31818fcb3b8fd73245 (patch)
tree4e1b060ee0e03ce298e3762b2843fbb183deff32
parentsys-kernel/git-sources: Automated version bump to 5.8_rc5. (diff)
downloadgentoo-cbde434758c938aa1452aa31818fcb3b8fd73245.tar.gz
gentoo-cbde434758c938aa1452aa31818fcb3b8fd73245.tar.bz2
gentoo-cbde434758c938aa1452aa31818fcb3b8fd73245.zip
sys-fs/lxcfs: systemd related fixes, #732364
Closes: https://bugs.gentoo.org/732364 Signed-off-by: Joonas Niilola <juippis@gentoo.org>
-rw-r--r--sys-fs/lxcfs/files/lxcfs-4.0.0.service18
-rw-r--r--sys-fs/lxcfs/lxcfs-4.0.4-r2.ebuild (renamed from sys-fs/lxcfs/lxcfs-4.0.4-r1.ebuild)2
2 files changed, 19 insertions, 1 deletions
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 000000000000..0bdab880a790
--- /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
index 583ac4fcfa62..ad87ebdf52bb 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
}