update linuxkit and linuxkit/init, ensure it stays cgroups v1

Signed-off-by: Avi Deitcher <[email protected]>

Makefile

@@ -306,7 +306,7 @@ PARSE_PKGS=$(if $(strip $(EVE_HASH)),EVE_HASH=)$(EVE_HASH) DOCKER_ARCH_TAG=$(DOC
 LINUXKIT=$(BUILDTOOLS_BIN)/linuxkit
 # linuxkit version. This **must** be a published semver version so it can be downloaded already compiled from
 # the release page at https://github.com/linuxkit/linuxkit/releases
-LINUXKIT_VERSION=v1.5.0
+LINUXKIT_VERSION=v1.5.1
 LINUXKIT_SOURCE=https://github.com/linuxkit/linuxkit
 LINUXKIT_OPTS=$(if $(strip $(EVE_HASH)),--hash) $(EVE_HASH) $(if $(strip $(EVE_REL)),--release) $(EVE_REL)
 LINUXKIT_PKG_TARGET=build

images/rootfs.yml.in

@@ -1,9 +1,9 @@
 kernel:
   image: KERNEL_TAG
-  cmdline: "rootdelay=3"
+  # the unified_cgroup_hierarchy forces cgroupsv1, which is required until pillar is ready to support v2
+  cmdline: "rootdelay=3 linuxkit.unified_cgroup_hierarchy=0"
 init:
-  - linuxkit/init:07d37c3ae7fad5ddcb54c8dc65774ae050851f04
-  - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f
+  - linuxkit/init:e6f99bdda1628d47f59dab20c85794b4ea6fad95
   - linuxkit/containerd:95d5f0d2d8dc63bd87e96b7b39cf026cb86125c9
   # pillar's logic rely on existence of getty and /etc/init.d/001-getty inside
   - linuxkit/getty:e74e6cad132403d1a6d6cd25b136a7c69c99f3f7

pkg/mkrootfs-ext4/make-rootfs

@@ -33,7 +33,7 @@ IMGFILE=/rootfs.img
   #
   CMDLINE="$(cat boot/cmdline)"
 
-  sed -i'' -e "/set *linuxkit_cmdline=/s#=.*\$#=$CMDLINE#" EFI/BOOT/grub.cfg
+  sed -i'' -e '/set *linuxkit_cmdline=/s#=.*$#="'"$CMDLINE"'"#' EFI/BOOT/grub.cfg
 
   ROOTFS_BLOCKSZ=4096
   ROOTFS_PART_HEADROOM_BLOCKS=16000

pkg/mkrootfs-squash/make-rootfs

@@ -33,7 +33,7 @@ IMGFILE=/rootfs.img
   #
   CMDLINE="$(cat boot/cmdline)"
 
-  sed -i'' -e "/set *linuxkit_cmdline=/s#=.*\$#=$CMDLINE#" EFI/BOOT/grub.cfg
+  sed -i'' -e '/set *linuxkit_cmdline=/s#=.*$#="'"$CMDLINE"'"#' EFI/BOOT/grub.cfg
 
   ROOTFS_BLOCKSZ=4096
   ROOTFS_PART_HEADROOM_BLOCKS=16000