summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoonas Niilola <juippis@gentoo.org>2020-10-21 09:03:53 +0300
committerJoonas Niilola <juippis@gentoo.org>2020-10-21 09:03:53 +0300
commit4b4cbd6f7c78abe9d831c8425b2a4ebdbba298ca (patch)
treecdf33e0f650bde9a1395d6109611d41750a9e8c8
parentmedia-gfx/gimp: 2.10.22 fix mypaint-brushes dependency (diff)
downloadgentoo-4b4cbd6f7c78abe9d831c8425b2a4ebdbba298ca.tar.gz
gentoo-4b4cbd6f7c78abe9d831c8425b2a4ebdbba298ca.tar.bz2
gentoo-4b4cbd6f7c78abe9d831c8425b2a4ebdbba298ca.zip
app-emulation/lxd: fix init.d to allow systemd cont on openrc host
Closes: https://bugs.gentoo.org/750410 Signed-off-by: Joonas Niilola <juippis@gentoo.org>
-rw-r--r--app-emulation/lxd/files/lxd-4.0.0.initd3
-rw-r--r--app-emulation/lxd/lxd-4.0.3-r1.ebuild (renamed from app-emulation/lxd/lxd-4.0.3.ebuild)2
2 files changed, 4 insertions, 1 deletions
diff --git a/app-emulation/lxd/files/lxd-4.0.0.initd b/app-emulation/lxd/files/lxd-4.0.0.initd
index 03ec12e44f56..f4206344355a 100644
--- a/app-emulation/lxd/files/lxd-4.0.0.initd
+++ b/app-emulation/lxd/files/lxd-4.0.0.initd
@@ -18,6 +18,9 @@ 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.ebuild b/app-emulation/lxd/lxd-4.0.3-r1.ebuild
index cecda7cf1eb8..fa42646855b0 100644
--- a/app-emulation/lxd/lxd-4.0.3.ebuild
+++ b/app-emulation/lxd/lxd-4.0.3-r1.ebuild
@@ -7,7 +7,7 @@ inherit autotools bash-completion-r1 linux-info optfeature systemd verify-sig
DESCRIPTION="Fast, dense and secure container management"
HOMEPAGE="https://linuxcontainers.org/lxd/introduction/ https://github.com/lxc/lxd"
-SRC_URI="https://linuxcontainers.org/downloads/${PN}/${P}.tar.gz
+SRC_URI="https://linuxcontainers.org/downloads/lxd/${P}.tar.gz
verify-sig? ( https://linuxcontainers.org/downloads/lxd/${P}.tar.gz.asc )"
# Needs to include licenses for all bundled programs and libraries.