summaryrefslogtreecommitdiff
path: root/sys-fs
diff options
context:
space:
mode:
authorJoonas Niilola <juippis@gentoo.org>2020-06-21 19:48:03 +0300
committerJoonas Niilola <juippis@gentoo.org>2020-06-21 20:02:08 +0300
commit019d6bc22c11aa9bb41510b920d579feb2c48316 (patch)
treee0cd16c39b551df7bfee3985f7be8fca537c51c1 /sys-fs
parentdev-ruby/rake-compiler: arm stable wrt bug #728194 (diff)
downloadgentoo-019d6bc22c11aa9bb41510b920d579feb2c48316.tar.gz
gentoo-019d6bc22c11aa9bb41510b920d579feb2c48316.tar.bz2
gentoo-019d6bc22c11aa9bb41510b920d579feb2c48316.zip
sys-fs/lxcfs: update fusermount path to systemd service file, #728470
Closes: https://bugs.gentoo.org/728470 Signed-off-by: Joonas Niilola <juippis@gentoo.org>
Diffstat (limited to 'sys-fs')
-rw-r--r--sys-fs/lxcfs/files/lxcfs.service16
-rw-r--r--sys-fs/lxcfs/lxcfs-4.0.4-r1.ebuild (renamed from sys-fs/lxcfs/lxcfs-4.0.4.ebuild)5
2 files changed, 20 insertions, 1 deletions
diff --git a/sys-fs/lxcfs/files/lxcfs.service b/sys-fs/lxcfs/files/lxcfs.service
new file mode 100644
index 000000000000..aea0d6d920fc
--- /dev/null
+++ b/sys-fs/lxcfs/files/lxcfs.service
@@ -0,0 +1,16 @@
+[Unit]
+Description=FUSE filesystem for LXC
+ConditionVirtualization=!container
+Before=lxc.service
+Documentation=man:lxcfs(1)
+
+[Service]
+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.ebuild b/sys-fs/lxcfs/lxcfs-4.0.4-r1.ebuild
index f1d2fdcd767f..583ac4fcfa62 100644
--- a/sys-fs/lxcfs/lxcfs-4.0.4.ebuild
+++ b/sys-fs/lxcfs/lxcfs-4.0.4-r1.ebuild
@@ -44,5 +44,8 @@ src_install() {
newconfd "${FILESDIR}"/lxcfs-4.0.0.confd lxcfs
newinitd "${FILESDIR}"/lxcfs-4.0.0.initd lxcfs
- systemd_dounit config/init/systemd/lxcfs.service
+
+ # Provide our own service file (copy of upstream) due to paths being different from upstream,
+ # 728470
+ systemd_dounit "${FILESDIR}"/lxcfs.service
}