From: Geaaru <geaaru@gmail.com>
Date: Fri, 20 Oct 2017 07:15:18 +0000 (+0200)
Subject: Fix start of Sabayon unprivileged containers
X-Git-Tag: lxc-3.0.0.beta1~211^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F1866%2Fhead;p=thirdparty%2Flxc.git

Fix start of Sabayon unprivileged containers

Problem happens for image with systemd >=233.
Minor fix for mirrors list.

Signed-off-by: Geaaru <geaaru@gmail.com>
---

diff --git a/templates/lxc-sabayon.in b/templates/lxc-sabayon.in
index 75e5c765e..fb9e62f58 100644
--- a/templates/lxc-sabayon.in
+++ b/templates/lxc-sabayon.in
@@ -39,13 +39,11 @@ readonly LXC_TEMPLATE_CONFIG='@LXCTEMPLATECONFIG@'
 readonly MIRRORS_LIST="
 http://mirror.it.sabayon.org/
 http://dl.sabayon.org/
-http://ftp.kddilabs.jp/Linux/packages/sabayonlinux/
 ftp://ftp.klid.dk/sabayonlinux/
 http://ftp.fsn.hu/pub/linux/distributions/sabayon/
 http://ftp.cc.uoc.gr/mirrors/linux/SabayonLinux/
 http://ftp.rnl.ist.utl.pt/pub/sabayon/
 ftp://ftp.nluug.nl/pub/os/Linux/distr/sabayonlinux/
-http://ftp.surfnet.nl/pub/os/Linux/distr/sabayonlinux/
 http://mirror.internode.on.net/pub/sabayon/
 http://mirror.yandex.ru/sabayon/
 http://sabayon.c3sl.ufpr.br/
@@ -295,6 +293,11 @@ lxc.idmap = g 0 ${mapped_gid} 65536
         unprivileged_options="
 $unprivileged_options
 
+# Force use of cgroup v1. Currently systemd doesn't support
+# correctly cgroup v2. See: https://github.com/lxc/lxc/issues/1669
+# about discussion of default-hierarchy option.
+lxc.init.cmd = /sbin/init systemd.legacy_systemd_cgroup_controller=yes
+
 # Include common configuration.
 lxc.include = $LXC_TEMPLATE_CONFIG/sabayon.userns.conf
 "