Debian: remove force-cgroups-v1 code

Per discussion in 2024-03-20 Planning meeting, we will no longer be testing runc in CI. And cgroups V1 is dead too. Signed-off-by: Ed Santiago <santiago@redhat.com>
containers · Mar 20, 2024 · 52e8fc2 · 52e8fc2
1 parent b0236da
commit 52e8fc2
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/IMG_SFX b/IMG_SFX
@@ -1 +1 @@
-20240320t153921z-f39f38d13
+20240320t171843z-f39f38d13
diff --git a/cache_images/debian_setup.sh b/cache_images/debian_setup.sh
@@ -27,8 +27,7 @@ bash $SCRIPT_DIRPATH/debian_packaging.sh
 
 if ! ((CONTAINER)); then
     warn "Making Debian kernel enable cgroup swap accounting"
-    warn "Forcing CgroupsV1"
-    SEDCMD='s/^GRUB_CMDLINE_LINUX="(.*)"/GRUB_CMDLINE_LINUX="\1 cgroup_enable=memory swapaccount=1 systemd.unified_cgroup_hierarchy=0"/'
+    SEDCMD='s/^GRUB_CMDLINE_LINUX="(.*)"/GRUB_CMDLINE_LINUX="\1 cgroup_enable=memory swapaccount=1"/'
     ooe.sh $SUDO sed -re "$SEDCMD" -i /etc/default/grub.d/*
     ooe.sh $SUDO sed -re "$SEDCMD" -i /etc/default/grub
     ooe.sh $SUDO update-grub