commit: 019d6bc22c11aa9bb41510b920d579feb2c48316 Author: Joonas Niilola <juippis <AT> gentoo <DOT> org> AuthorDate: Sun Jun 21 16:48:03 2020 +0000 Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org> CommitDate: Sun Jun 21 17:02:08 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=019d6bc2
sys-fs/lxcfs: update fusermount path to systemd service file, #728470 Closes: https://bugs.gentoo.org/728470 Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org> sys-fs/lxcfs/files/lxcfs.service | 16 ++++++++++++++++ .../lxcfs/{lxcfs-4.0.4.ebuild => lxcfs-4.0.4-r1.ebuild} | 5 ++++- 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/sys-fs/lxcfs/files/lxcfs.service b/sys-fs/lxcfs/files/lxcfs.service new file mode 100644 index 00000000000..aea0d6d920f --- /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 similarity index 86% rename from sys-fs/lxcfs/lxcfs-4.0.4.ebuild rename to sys-fs/lxcfs/lxcfs-4.0.4-r1.ebuild index f1d2fdcd767..583ac4fcfa6 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 }
