From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id DFA15138359 for ; Wed, 21 Oct 2020 06:04:27 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 24503E0AF6; Wed, 21 Oct 2020 06:04:27 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id D8571E0AF6 for ; Wed, 21 Oct 2020 06:04:26 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 5929D335D19 for ; Wed, 21 Oct 2020 06:04:25 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id BFA2A33A for ; Wed, 21 Oct 2020 06:04:23 +0000 (UTC) From: "Joonas Niilola" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Joonas Niilola" Message-ID: <1603260233.4b4cbd6f7c78abe9d831c8425b2a4ebdbba298ca.juippis@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-emulation/lxd/, app-emulation/lxd/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-emulation/lxd/files/lxd-4.0.0.initd app-emulation/lxd/lxd-4.0.3-r1.ebuild app-emulation/lxd/lxd-4.0.3.ebuild X-VCS-Directories: app-emulation/lxd/files/ app-emulation/lxd/ X-VCS-Committer: juippis X-VCS-Committer-Name: Joonas Niilola X-VCS-Revision: 4b4cbd6f7c78abe9d831c8425b2a4ebdbba298ca X-VCS-Branch: master Date: Wed, 21 Oct 2020 06:04:23 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 05b2fb97-5067-416f-80c4-bc18bba28bb5 X-Archives-Hash: d79e588bac92ef5a3bb1385256704158 commit: 4b4cbd6f7c78abe9d831c8425b2a4ebdbba298ca Author: Joonas Niilola gentoo org> AuthorDate: Wed Oct 21 06:03:53 2020 +0000 Commit: Joonas Niilola gentoo org> CommitDate: Wed Oct 21 06:03:53 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4b4cbd6f app-emulation/lxd: fix init.d to allow systemd cont on openrc host Closes: https://bugs.gentoo.org/750410 Signed-off-by: Joonas Niilola gentoo.org> app-emulation/lxd/files/lxd-4.0.0.initd | 3 +++ app-emulation/lxd/{lxd-4.0.3.ebuild => lxd-4.0.3-r1.ebuild} | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/app-emulation/lxd/files/lxd-4.0.0.initd b/app-emulation/lxd/files/lxd-4.0.0.initd index 03ec12e44f5..f4206344355 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 similarity index 98% rename from app-emulation/lxd/lxd-4.0.3.ebuild rename to app-emulation/lxd/lxd-4.0.3-r1.ebuild index cecda7cf1eb..fa42646855b 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.