From cce4df0796b9562234870ad77433a4307cef9a5b Mon Sep 17 00:00:00 2001
From: kenzok8 <kenzok8@users.noreply.github.com>
Date: Fri, 25 Oct 2024 20:37:53 +0800
Subject: [PATCH] update 2024-10-25 20:37:53

---
 dockerd/Config.in           | 6 +++---
 dockerd/git-short-commit.sh | 3 ++-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/dockerd/Config.in b/dockerd/Config.in
index d5763f051..2e7502a71 100644
--- a/dockerd/Config.in
+++ b/dockerd/Config.in
@@ -9,7 +9,7 @@ config DOCKER_CHECK_CONFIG
 
 config DOCKER_CGROUP_OPTIONS
 	bool "Enable available kernel support for CGroupsV1"
-	default n
+	default y
 	depends on PACKAGE_dockerd
 	select KERNEL_CGROUP_DEVICE
 	select KERNEL_CGROUP_FREEZER
@@ -54,7 +54,7 @@ menu "Network"
 
 	config DOCKER_NET_MACVLAN
 		bool "Includes macvlan kernel modules"
-		default n
+		default y
 		select PACKAGE_kmod-macvlan
 		select PACKAGE_kmod-dummy
 
@@ -75,7 +75,7 @@ menu "Storage"
 
 	config DOCKER_STO_EXT4
 		bool "Enables support for ext3 or ext4 as the backing filesystem"
-		default n
+		default y
 		select KERNEL_EXT4_FS_POSIX_ACL
 		select KERNEL_EXT4_FS_SECURITY
 
diff --git a/dockerd/git-short-commit.sh b/dockerd/git-short-commit.sh
index ea8611ba5..5edc7ff2e 100755
--- a/dockerd/git-short-commit.sh
+++ b/dockerd/git-short-commit.sh
@@ -1,3 +1,4 @@
+
 #!/bin/sh
 #
 #	USAGE: git-short-commit.sh <GIT_URL> <GIT_REF> <GIT_DIR>
@@ -26,7 +27,7 @@ if [ -z "${GIT_DIR}" ]; then
 fi
 
 clean_up() {
-	rm --force --recursive "${GIT_DIR}"
+	rm -rf "${GIT_DIR}"
 }
 trap clean_up EXIT