From 88331e0555658be41276981211e9f0d22575703d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=A5=D0=B8=D1=80=D0=B5=D1=86=D0=BA=D0=B8=D0=B9=20=D0=9C?= =?UTF-8?q?=D0=B8=D1=85=D0=B0=D0=B8=D0=BB?= Date: Fri, 20 Nov 2020 12:38:57 +0300 Subject: [PATCH] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5?= =?UTF-8?q?=D0=BD=D1=8B=20=D1=88=D0=B0=D0=B1=D0=BB=D0=BE=D0=BD=D1=8B=20dev?= =?UTF-8?q?-libs/libcgroup?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- merge/dev-libs/.calculate_directory | 1 + merge/dev-libs/libcgroup/.calculate_directory | 1 + merge/dev-libs/libcgroup/cgconfig | 3 +++ merge/dev-libs/libcgroup/cgconfig.conf | 5 +++++ merge/dev-libs/libcgroup/default/.calculate_directory | 1 + merge/dev-libs/libcgroup/default/cgconfig | 2 ++ 6 files changed, 13 insertions(+) create mode 100644 merge/dev-libs/.calculate_directory create mode 100644 merge/dev-libs/libcgroup/.calculate_directory create mode 100644 merge/dev-libs/libcgroup/cgconfig create mode 100644 merge/dev-libs/libcgroup/cgconfig.conf create mode 100644 merge/dev-libs/libcgroup/default/.calculate_directory create mode 100644 merge/dev-libs/libcgroup/default/cgconfig diff --git a/merge/dev-libs/.calculate_directory b/merge/dev-libs/.calculate_directory new file mode 100644 index 0000000..8e3df7f --- /dev/null +++ b/merge/dev-libs/.calculate_directory @@ -0,0 +1 @@ +{% calculate append = 'skip' %} diff --git a/merge/dev-libs/libcgroup/.calculate_directory b/merge/dev-libs/libcgroup/.calculate_directory new file mode 100644 index 0000000..ce3c816 --- /dev/null +++ b/merge/dev-libs/libcgroup/.calculate_directory @@ -0,0 +1 @@ +{% calculate append='skip', package='dev-libs/libcgroup' %} diff --git a/merge/dev-libs/libcgroup/cgconfig b/merge/dev-libs/libcgroup/cgconfig new file mode 100644 index 0000000..81a6004 --- /dev/null +++ b/merge/dev-libs/libcgroup/cgconfig @@ -0,0 +1,3 @@ +{% calculate format='openrc', path='/etc/conf.d' %} + +rc_before="docker lxc" diff --git a/merge/dev-libs/libcgroup/cgconfig.conf b/merge/dev-libs/libcgroup/cgconfig.conf new file mode 100644 index 0000000..96b837f --- /dev/null +++ b/merge/dev-libs/libcgroup/cgconfig.conf @@ -0,0 +1,5 @@ +{% calculate format='raw', append='after', path='/etc/cgroup', (not grep('/etc/cgroup/cgconfig.conf','name=systemd')) %} + +mount { + "name=systemd" = /sys/fs/cgroup/systemd; +} diff --git a/merge/dev-libs/libcgroup/default/.calculate_directory b/merge/dev-libs/libcgroup/default/.calculate_directory new file mode 100644 index 0000000..3e91c01 --- /dev/null +++ b/merge/dev-libs/libcgroup/default/.calculate_directory @@ -0,0 +1 @@ +{% calculate path='/etc/runlevels' %} diff --git a/merge/dev-libs/libcgroup/default/cgconfig b/merge/dev-libs/libcgroup/default/cgconfig new file mode 100644 index 0000000..9d4ee78 --- /dev/null +++ b/merge/dev-libs/libcgroup/default/cgconfig @@ -0,0 +1,2 @@ +{% save custom.runlevels.cgconfig = "on" %} +{% calculate append="link", source="/etc/init.d/cgconfig" %}