commit:     1e6334d771a7f7b7b38c8221a5649f2e81c5ce8a
Author:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 26 06:25:22 2020 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Mon Oct 26 06:29:59 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1e6334d7

app-emulation/lxd: revert openrc -> systemd-cgroups fix

 - it now breaks openrc -> openrc-cgroups instead. A better solution needs to
   be found. Please see
   
https://wiki.gentoo.org/wiki/LXD#Running_systemd_based_containers_on_OpenRC_hosts
   for a workaround, that you can add to your own init.d file if needed.

Bug: https://bugs.gentoo.org/750410
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 app-emulation/lxd/files/lxd-4.0.0.initd                        | 3 ---
 app-emulation/lxd/{lxd-4.0.3-r1.ebuild => lxd-4.0.3-r2.ebuild} | 0
 app-emulation/lxd/{lxd-4.0.4.ebuild => lxd-4.0.4-r1.ebuild}    | 0
 3 files changed, 3 deletions(-)

diff --git a/app-emulation/lxd/files/lxd-4.0.0.initd 
b/app-emulation/lxd/files/lxd-4.0.0.initd
index f4206344355..03ec12e44f5 100644
--- a/app-emulation/lxd/files/lxd-4.0.0.initd
+++ b/app-emulation/lxd/files/lxd-4.0.0.initd
@@ -18,9 +18,6 @@ start() {
 
        modprobe -f loop > /dev/null 2>&1
 
-       # Allow systemd containers to be used on openrc host, #750410
-       [ -d /sys/fs/cgroup/systemd ] || ( mkdir -p /sys/fs/cgroup/systemd ; 
mount -t cgroup -o none,name=systemd systemd /sys/fs/cgroup/systemd )
-
        # fix permissions on /var/lib/lxd and make sure it exists
        install -d /var/lib/lxd --group lxd --owner root --mode 0775
        start-stop-daemon --start \

diff --git a/app-emulation/lxd/lxd-4.0.3-r1.ebuild 
b/app-emulation/lxd/lxd-4.0.3-r2.ebuild
similarity index 100%
rename from app-emulation/lxd/lxd-4.0.3-r1.ebuild
rename to app-emulation/lxd/lxd-4.0.3-r2.ebuild

diff --git a/app-emulation/lxd/lxd-4.0.4.ebuild 
b/app-emulation/lxd/lxd-4.0.4-r1.ebuild
similarity index 100%
rename from app-emulation/lxd/lxd-4.0.4.ebuild
rename to app-emulation/lxd/lxd-4.0.4-r1.ebuild

Reply via email to