From 18ed32eea95d4b1558e244e425dbac7f03523faa Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Fri, 25 Oct 2019 15:54:33 +0200 Subject: [PATCH] 2303.99.0 --- build_library/grub.cfg | 2 +- build_library/test_image_content.sh | 4 ++-- build_torcx_store | 4 +--- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/build_library/grub.cfg b/build_library/grub.cfg index c229cf35cd..402e35cf5a 100644 --- a/build_library/grub.cfg +++ b/build_library/grub.cfg @@ -19,7 +19,7 @@ set randomize_disk_guid="" set oem_id="" # Anything else the OEM adds should use this variable. -set linux_append="" +set linux_append="systemd.unified_cgroup_hierarchy=false systemd.legacy_systemd_cgroup_controller=false" set secure_boot="0" diff --git a/build_library/test_image_content.sh b/build_library/test_image_content.sh index 260acc0c61..80b784fd9f 100644 --- a/build_library/test_image_content.sh +++ b/build_library/test_image_content.sh @@ -5,8 +5,8 @@ GLSA_WHITELIST=( 201412-09 # incompatible CA certificate version numbers 201908-14 # backported both CVE fixes - 201909-01 # Perl, SDK only - 201909-08 # backported fix + 201909-01 # perl + 201909-08 # dbus ) glsa_image() { diff --git a/build_torcx_store b/build_torcx_store index 926182974d..cbf4c36ba4 100755 --- a/build_torcx_store +++ b/build_torcx_store @@ -237,14 +237,12 @@ function torcx_package() { # for each package will point at the last version specified. This can handle # swapping default package versions for different OS releases by reordering. DEFAULT_IMAGES=( - =app-torcx/docker-1.12 - =app-torcx/docker-18.06 + =app-torcx/docker-19.03 ) # This list contains extra images which will be uploaded and included in the # generated manifest, but won't be included in the vendor store. EXTRA_IMAGES=( - =app-torcx/docker-17.03 ) mkdir -p "${BUILD_DIR}"