gentoo resync : 29.06.2020

3 files changed, 16 insertions, 41 deletions

diff --git a/sys-fs/lxcfs/files/lxcfs-fusermount-path.patch b/sys-fs/lxcfs/files/lxcfs-fusermount-path.patch
deleted file mode 100644
index 99a5addf1d10..000000000000
--- a/sys-fs/lxcfs/files/lxcfs-fusermount-path.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- /config/init/systemd/lxcfs.service.orig	2018-10-13 17:24:46.534035126 -0500
-+++ /config/init/systemd/lxcfs.service	2018-10-13 17:25:33.007034294 -0500
-@@ -5,10 +5,10 @@
- Documentation=man:lxcfs(1)
- 
- [Service]
--ExecStart=/usr/bin/lxcfs /var/lib/lxcfs/
-+ExecStart=/usr/bin/lxcfs -o allow_other,nonempty /var/lib/lxcfs/
- KillMode=process
- Restart=on-failure
--ExecStopPost=-/bin/fusermount -u /var/lib/lxcfs
-+ExecStopPost=-/usr/bin/fusermount -u /var/lib/lxcfs
- Delegate=yes
- 
- [Install]
diff --git a/sys-fs/lxcfs/files/lxcfs.initd b/sys-fs/lxcfs/files/lxcfs.initd
deleted file mode 100644
index 5997426fa8e8..000000000000
--- a/sys-fs/lxcfs/files/lxcfs.initd
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-DAEMON=/usr/bin/lxcfs
-PIDFILE=/run/lxcfs.pid
-
-start() {
-    ebegin "Starting lxcfs"
-
-    start-stop-daemon --start \
-		      --pidfile ${PIDFILE} \
-		      --exec ${DAEMON} \
-		      --background \
-		      --make-pidfile \
-		      -- \
-		      -o allow_other,nonempty /var/lib/lxcfs
-
-    eend $?
-}
-
-stop() {
-    ebegin "Stopping lxcfs"
-    start-stop-daemon --stop --quiet -R TERM/45 -p ${PIDFILE}
-    eend $?
-}
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