diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2018-10-22 11:09:47 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2018-10-22 11:09:47 +0100 |
commit | 64e107b9b6058580ff0432107eb37cefb0b2a7d8 (patch) | |
tree | 9a44e603e2ae365e2b1fe35ac37f73e830cdee1d /sys-fs/lxcfs/files | |
parent | 957235cf19a691360c720f7913672adda4258ed0 (diff) |
gentoo resync : 22.10.2018
Diffstat (limited to 'sys-fs/lxcfs/files')
-rw-r--r-- | sys-fs/lxcfs/files/lxcfs-2.0.4-fusermount-path.patch | 11 | ||||
-rw-r--r-- | sys-fs/lxcfs/files/lxcfs-2.0.6-fusermount-path.patch | 11 | ||||
-rw-r--r-- | sys-fs/lxcfs/files/lxcfs-2.0.6.initd | 26 | ||||
-rw-r--r-- | sys-fs/lxcfs/files/lxcfs-3.0.2-fusermount-path.patch | 15 | ||||
-rw-r--r-- | sys-fs/lxcfs/files/lxcfs-3.0.2.initd (renamed from sys-fs/lxcfs/files/lxcfs-2.0.4.initd) | 4 |
5 files changed, 17 insertions, 50 deletions
diff --git a/sys-fs/lxcfs/files/lxcfs-2.0.4-fusermount-path.patch b/sys-fs/lxcfs/files/lxcfs-2.0.4-fusermount-path.patch deleted file mode 100644 index 61d3494fb7f3..000000000000 --- a/sys-fs/lxcfs/files/lxcfs-2.0.4-fusermount-path.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- /config/init/systemd/lxcfs.service.orig 2016-07-11 01:18:57.688074437 +0000 -+++ /config/init/systemd/lxcfs.service 2016-07-11 01:19:48.516477185 +0000 -@@ -7,7 +7,7 @@ - ExecStart=/usr/bin/lxcfs /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-2.0.6-fusermount-path.patch b/sys-fs/lxcfs/files/lxcfs-2.0.6-fusermount-path.patch deleted file mode 100644 index 61d3494fb7f3..000000000000 --- a/sys-fs/lxcfs/files/lxcfs-2.0.6-fusermount-path.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- /config/init/systemd/lxcfs.service.orig 2016-07-11 01:18:57.688074437 +0000 -+++ /config/init/systemd/lxcfs.service 2016-07-11 01:19:48.516477185 +0000 -@@ -7,7 +7,7 @@ - ExecStart=/usr/bin/lxcfs /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-2.0.6.initd b/sys-fs/lxcfs/files/lxcfs-2.0.6.initd deleted file mode 100644 index dfc5725f693f..000000000000 --- a/sys-fs/lxcfs/files/lxcfs-2.0.6.initd +++ /dev/null @@ -1,26 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2017 Gentoo Foundation -# 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 \ - -- \ - -f -o allow_other /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-3.0.2-fusermount-path.patch b/sys-fs/lxcfs/files/lxcfs-3.0.2-fusermount-path.patch new file mode 100644 index 000000000000..99a5addf1d10 --- /dev/null +++ b/sys-fs/lxcfs/files/lxcfs-3.0.2-fusermount-path.patch @@ -0,0 +1,15 @@ +--- /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-2.0.4.initd b/sys-fs/lxcfs/files/lxcfs-3.0.2.initd index dd556894b7fc..52d8202d7ac3 100644 --- a/sys-fs/lxcfs/files/lxcfs-2.0.4.initd +++ b/sys-fs/lxcfs/files/lxcfs-3.0.2.initd @@ -1,5 +1,5 @@ #!/sbin/openrc-run -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2018 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 DAEMON=/usr/bin/lxcfs @@ -14,7 +14,7 @@ start() { --background \ --make-pidfile \ -- \ - -f -o allow_other /var/lib/lxcfs + -o allow_other,nonempty /var/lib/lxcfs eend $? } |