[PATCH 1/2] mountkernfs: Mount cgroup2 hierarchy

[PATCH 1/2] mountkernfs: Mount cgroup2 hierarchy

[Michael Tremer]

[-- Attachment #1: Type: text/plain, Size: 773 bytes --]

Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
---
 src/initscripts/system/mountkernfs | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/initscripts/system/mountkernfs b/src/initscripts/system/mountkernfs
index f0bfc5289..264da24c4 100644
--- a/src/initscripts/system/mountkernfs
+++ b/src/initscripts/system/mountkernfs
@@ -34,6 +34,11 @@ case "${1}" in
 			mount -n -t tmpfs -o nosuid,nodev,mode=755,size=8M /run /run || failed=1
 		fi
 
+		if ! mountpoint /sys/fs/cgroup &> /dev/null; then
+			boot_mesg -n " /sys/fs/cgroup" ${NORMAL}
+			mount -t cgroup2 none /sys/fs/cgroup || failed=1
+		fi
+
 		# create folder for dhcpcd changeroot
 		mkdir -p /run/dhcpcd/chroot
 		chown dhcpcd:dhcpcd /run/dhcpcd/chroot
-- 
2.20.1

[PATCH 2/2] libvirtd: Enable required cgroups

[Michael Tremer]

[-- Attachment #1: Type: text/plain, Size: 1174 bytes --]

Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
---
 lfs/libvirt                       | 2 +-
 src/initscripts/packages/libvirtd | 7 ++++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/lfs/libvirt b/lfs/libvirt
index 28a95d317..b680cbb3d 100644
--- a/lfs/libvirt
+++ b/lfs/libvirt
@@ -33,7 +33,7 @@ DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 SUP_ARCH   = i586 x86_64
 PROG       = libvirt
-PAK_VER    = 25
+PAK_VER    = 26
 
 DEPS       = ebtables libpciaccess libtirpc libyajl ncat qemu
 
diff --git a/src/initscripts/packages/libvirtd b/src/initscripts/packages/libvirtd
index 40bc6bee3..f0a0b1e8a 100644
--- a/src/initscripts/packages/libvirtd
+++ b/src/initscripts/packages/libvirtd
@@ -20,9 +20,14 @@ case $1 in
 		boot_mesg "Load required kernel modules for Libvirt"
 		modprobe tun vhost_net
 		evaluate_retval
+
+		# Enable required cgroup controllers
+		if [ -d "/sys/fs/cgroup" ]; then
+			echo "+cpu +io" > /sys/fs/cgroup/cgroup.subtree_control
+		fi
+
 		boot_mesg "Starting Libvirt Daemon..."
 		loadproc /usr/sbin/libvirtd -d
-
 		;;
 
 	stop)
-- 
2.20.1