From 4e5e3f3f7aa5f0542548c0ff86398254b3b9e0fa Mon Sep 17 00:00:00 2001 From: CloudBuilder Date: Thu, 30 Sep 2021 04:30:58 +0000 Subject: [PATCH] Imported 2.741 No reason for CPC update specified. --- debian/changelog | 7 +++++++ live-build/functions | 2 ++ 2 files changed, 9 insertions(+) diff --git a/debian/changelog b/debian/changelog index 528b701e..02ca3e7d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +livecd-rootfs (2.741) impish; urgency=medium + + [ John Chittum ] + * mount cgroup2 type for snapd LP:#1944004 + + -- Steve Langasek Wed, 29 Sep 2021 11:25:24 -0700 + livecd-rootfs (2.740) impish; urgency=medium [ Thomas Bechtold ] diff --git a/live-build/functions b/live-build/functions index 9b048c08..8a6777f2 100644 --- a/live-build/functions +++ b/live-build/functions @@ -138,6 +138,8 @@ setup_mountpoint() { # Provide more up to date apparmor features, matching target kernel mount -o bind /usr/share/livecd-rootfs/live-build/apparmor/generic "$mountpoint/sys/kernel/security/apparmor/features/" mount -o bind /usr/share/livecd-rootfs/live-build/seccomp/generic.actions_avail "$mountpoint/proc/sys/kernel/seccomp/actions_avail" + # cgroup2 mount for LP: 1944004 + mount -t cgroup2 none "$mountpoint/sys/fs/cgroup" mount -t tmpfs none "$mountpoint/tmp" mount -t tmpfs none "$mountpoint/var/lib/apt" mount -t tmpfs none "$mountpoint/var/cache/apt"