Gentoo Archives: gentoo-commits

From: Joonas Niilola <juippis@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-emulation/lxd/files/, app-emulation/lxd/
Date: Mon, 26 Oct 2020 06:30:14
Message-Id: 1603693799.1e6334d771a7f7b7b38c8221a5649f2e81c5ce8a.juippis@gentoo
1 commit: 1e6334d771a7f7b7b38c8221a5649f2e81c5ce8a
2 Author: Joonas Niilola <juippis <AT> gentoo <DOT> org>
3 AuthorDate: Mon Oct 26 06:25:22 2020 +0000
4 Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
5 CommitDate: Mon Oct 26 06:29:59 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1e6334d7
7
8 app-emulation/lxd: revert openrc -> systemd-cgroups fix
9
10 - it now breaks openrc -> openrc-cgroups instead. A better solution needs to
11 be found. Please see
12 https://wiki.gentoo.org/wiki/LXD#Running_systemd_based_containers_on_OpenRC_hosts
13 for a workaround, that you can add to your own init.d file if needed.
14
15 Bug: https://bugs.gentoo.org/750410
16 Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
17
18 app-emulation/lxd/files/lxd-4.0.0.initd | 3 ---
19 app-emulation/lxd/{lxd-4.0.3-r1.ebuild => lxd-4.0.3-r2.ebuild} | 0
20 app-emulation/lxd/{lxd-4.0.4.ebuild => lxd-4.0.4-r1.ebuild} | 0
21 3 files changed, 3 deletions(-)
22
23 diff --git a/app-emulation/lxd/files/lxd-4.0.0.initd b/app-emulation/lxd/files/lxd-4.0.0.initd
24 index f4206344355..03ec12e44f5 100644
25 --- a/app-emulation/lxd/files/lxd-4.0.0.initd
26 +++ b/app-emulation/lxd/files/lxd-4.0.0.initd
27 @@ -18,9 +18,6 @@ start() {
28
29 modprobe -f loop > /dev/null 2>&1
30
31 - # Allow systemd containers to be used on openrc host, #750410
32 - [ -d /sys/fs/cgroup/systemd ] || ( mkdir -p /sys/fs/cgroup/systemd ; mount -t cgroup -o none,name=systemd systemd /sys/fs/cgroup/systemd )
33 -
34 # fix permissions on /var/lib/lxd and make sure it exists
35 install -d /var/lib/lxd --group lxd --owner root --mode 0775
36 start-stop-daemon --start \
37
38 diff --git a/app-emulation/lxd/lxd-4.0.3-r1.ebuild b/app-emulation/lxd/lxd-4.0.3-r2.ebuild
39 similarity index 100%
40 rename from app-emulation/lxd/lxd-4.0.3-r1.ebuild
41 rename to app-emulation/lxd/lxd-4.0.3-r2.ebuild
42
43 diff --git a/app-emulation/lxd/lxd-4.0.4.ebuild b/app-emulation/lxd/lxd-4.0.4-r1.ebuild
44 similarity index 100%
45 rename from app-emulation/lxd/lxd-4.0.4.ebuild
46 rename to app-emulation/lxd/lxd-4.0.4-r1.ebuild