From 4bf9452026151b745bc74cf06cb184eca6e729e7 Mon Sep 17 00:00:00 2001 From: Timo Reichl Date: Fri, 13 Oct 2023 23:06:46 +0200 Subject: [PATCH] docker: Parameterize loading the loop kernel module Signed-off-by: Timo Reichl --- srcpkgs/docker-cli/template | 2 +- srcpkgs/moby/files/docker/run | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/srcpkgs/docker-cli/template b/srcpkgs/docker-cli/template index 4550d3852d7da..b5e51b7cc8768 100644 --- a/srcpkgs/docker-cli/template +++ b/srcpkgs/docker-cli/template @@ -2,7 +2,7 @@ # should be kept in sync with moby pkgname=docker-cli version=24.0.6 -revision=1 +revision=2 build_style=go go_package="github.com/docker/cli/cmd/docker" go_import_path="github.com/docker/cli" diff --git a/srcpkgs/moby/files/docker/run b/srcpkgs/moby/files/docker/run index 959c22b803c58..386830059f770 100644 --- a/srcpkgs/moby/files/docker/run +++ b/srcpkgs/moby/files/docker/run @@ -1,7 +1,10 @@ #!/bin/sh exec 2>&1 [ -r conf ] && . ./conf -modprobe -q loop || exit 1 +case "${LOAD_LOOP_MODULE:-yes}" in + no) ;; + *) modprobe -q loop || exit 1 ;; +esac mountpoint -q /sys/fs/cgroup/systemd || { mkdir -p /sys/fs/cgroup/systemd; mount -t cgroup -o none,name=systemd cgroup /sys/fs/cgroup/systemd;