From 47c116dfdf24a41300f2707846726470afa48464 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Zolt=C3=A1n=20Felleg?= Date: Mon, 29 Mar 2021 13:39:34 +0200 Subject: [PATCH] Updated all containers (switched cgroup rules to cgroup2). --- sources/efg.pm/config | 5 ++--- sources/ens.pm/config | 5 ++--- sources/ifg.usr/config | 5 ++--- sources/ins.usr/config | 5 ++--- sources/ldap.usr/config | 5 ++--- sources/pns.pm/config | 5 ++--- sources/pns.usr/config | 5 ++--- sources/svc.usr/config | 5 ++--- sources/vpn.usr/config | 3 +-- sources/ws.pm/config | 5 ++--- sources/xfr.pm/config | 5 ++--- 11 files changed, 21 insertions(+), 32 deletions(-) diff --git a/sources/efg.pm/config b/sources/efg.pm/config index 024e02a..a7d7c76 100644 --- a/sources/efg.pm/config +++ b/sources/efg.pm/config @@ -23,11 +23,10 @@ lxc.net.2.link = bre-dev lxc.net.2.name = eth2 lxc.net.2.hwaddr = 02:0c:18:03:89:89 -lxc.cgroup.devices.allow = -lxc.cgroup.devices.deny = - lxc.autodev = 1 +lxc.cgroup2.devices.allow = a + lxc.signal.halt = SIGRTMIN+4 lxc.start.auto = 1 diff --git a/sources/ens.pm/config b/sources/ens.pm/config index 1197d77..cb66ee2 100644 --- a/sources/ens.pm/config +++ b/sources/ens.pm/config @@ -10,11 +10,10 @@ lxc.net.0.flags = up lxc.net.0.link = brh-dev lxc.net.0.hwaddr = 02:0c:18:03:ad:40 -lxc.cgroup.devices.allow = -lxc.cgroup.devices.deny = - lxc.autodev = 1 +lxc.cgroup2.devices.allow = a + lxc.signal.halt = SIGRTMIN+4 lxc.start.auto = 1 diff --git a/sources/ifg.usr/config b/sources/ifg.usr/config index 523e730..f66a40e 100644 --- a/sources/ifg.usr/config +++ b/sources/ifg.usr/config @@ -17,11 +17,10 @@ lxc.net.1.link = brh-dev lxc.net.1.name = eth1 lxc.net.1.hwaddr = 02:0c:18:03:ad:01 -lxc.cgroup.devices.allow = -lxc.cgroup.devices.deny = - lxc.autodev = 1 +lxc.cgroup2.devices.allow = a + lxc.signal.halt = SIGRTMIN+4 lxc.start.auto = 1 diff --git a/sources/ins.usr/config b/sources/ins.usr/config index 00ed33e..6722143 100644 --- a/sources/ins.usr/config +++ b/sources/ins.usr/config @@ -10,11 +10,10 @@ lxc.net.0.flags = up lxc.net.0.link = bri-dev lxc.net.0.hwaddr = 02:0c:18:03:6d:68 -lxc.cgroup.devices.allow = -lxc.cgroup.devices.deny = - lxc.autodev = 1 +lxc.cgroup2.devices.allow = a + lxc.signal.halt = SIGRTMIN+4 lxc.start.auto = 1 diff --git a/sources/ldap.usr/config b/sources/ldap.usr/config index 1068360..ed9fade 100644 --- a/sources/ldap.usr/config +++ b/sources/ldap.usr/config @@ -10,11 +10,10 @@ lxc.net.0.flags = up lxc.net.0.link = bri-dev lxc.net.0.hwaddr = 02:0c:18:03:6d:fc -lxc.cgroup.devices.allow = -lxc.cgroup.devices.deny = - lxc.autodev = 1 +lxc.cgroup2.devices.allow = a + lxc.signal.halt = SIGRTMIN+4 lxc.start.auto = 1 diff --git a/sources/pns.pm/config b/sources/pns.pm/config index 9f857ea..eb413d8 100644 --- a/sources/pns.pm/config +++ b/sources/pns.pm/config @@ -10,11 +10,10 @@ lxc.net.0.flags = up lxc.net.0.link = brh-dev lxc.net.0.hwaddr = 02:0c:18:03:ad:ae -lxc.cgroup.devices.allow = -lxc.cgroup.devices.deny = - lxc.autodev = 1 +lxc.cgroup2.devices.allow = a + lxc.signal.halt = SIGRTMIN+4 lxc.start.auto = 1 diff --git a/sources/pns.usr/config b/sources/pns.usr/config index dc59419..499be9a 100644 --- a/sources/pns.usr/config +++ b/sources/pns.usr/config @@ -10,11 +10,10 @@ lxc.net.0.flags = up lxc.net.0.link = bri-dev lxc.net.0.hwaddr = 02:0c:18:03:6d:ae -lxc.cgroup.devices.allow = -lxc.cgroup.devices.deny = - lxc.autodev = 1 +lxc.cgroup2.devices.allow = a + lxc.signal.halt = SIGRTMIN+4 lxc.start.auto = 1 diff --git a/sources/svc.usr/config b/sources/svc.usr/config index 8a316da..d4c56cb 100644 --- a/sources/svc.usr/config +++ b/sources/svc.usr/config @@ -10,11 +10,10 @@ lxc.net.0.flags = up lxc.net.0.link = bri-dev lxc.net.0.hwaddr = 02:0c:18:03:6d:fd -lxc.cgroup.devices.allow = -lxc.cgroup.devices.deny = - lxc.autodev = 1 +lxc.cgroup2.devices.allow = a + lxc.signal.halt = SIGRTMIN+4 lxc.start.auto = 1 diff --git a/sources/vpn.usr/config b/sources/vpn.usr/config index e8c37f8..659ee12 100644 --- a/sources/vpn.usr/config +++ b/sources/vpn.usr/config @@ -13,8 +13,7 @@ lxc.net.0.hwaddr = 02:0c:18:03:6d:ec lxc.autodev = 1 lxc.hook.autodev = __CONTAINER_PATH__/hooks/autodev -lxc.cgroup.devices.allow = -lxc.cgroup.devices.deny = +lxc.cgroup2.devices.allow = a lxc.signal.halt = SIGRTMIN+4 diff --git a/sources/ws.pm/config b/sources/ws.pm/config index 05e2234..84bc6d4 100644 --- a/sources/ws.pm/config +++ b/sources/ws.pm/config @@ -14,11 +14,10 @@ lxc.net.0.flags = up lxc.net.0.link = brh-dev lxc.net.0.hwaddr = 02:0c:18:03:ad:f9 -lxc.cgroup.devices.allow = -lxc.cgroup.devices.deny = - lxc.autodev = 1 +lxc.cgroup2.devices.allow = a + lxc.signal.halt = SIGRTMIN+4 lxc.start.auto = 1 diff --git a/sources/xfr.pm/config b/sources/xfr.pm/config index 6747fee..cdcfe71 100644 --- a/sources/xfr.pm/config +++ b/sources/xfr.pm/config @@ -11,11 +11,10 @@ lxc.net.0.flags = up lxc.net.0.link = brh-dev lxc.net.0.hwaddr = 02:0c:18:03:ad:fb -lxc.cgroup.devices.allow = -lxc.cgroup.devices.deny = - lxc.autodev = 1 +lxc.cgroup2.devices.allow = a + lxc.signal.halt = SIGRTMIN+4 lxc.start.auto = 1 -- 2.54.0