From 00900e8e837104fb8ec971236a3be464e59eb88c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E4=B8=81?= <liudi1366@gmail.com>
Date: Thu, 11 Sep 2025 19:12:11 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dinstall=5Fpackages?=
 =?UTF-8?q?=E5=87=BD=E6=95=B0=E7=9A=84=E9=94=99=E8=AF=AF=E5=A4=84=E7=90=86?=
 =?UTF-8?q?=E5=92=8C=E5=81=A5=E5=A3=AE=E6=80=A7=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 container/docker2rootfs/setup-image | 11 ++++++++---
 container/osimage/create-image      |  7 ++++++-
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/container/docker2rootfs/setup-image b/container/docker2rootfs/setup-image
index 47bfb7eb8..72723d02f 100755
--- a/container/docker2rootfs/setup-image
+++ b/container/docker2rootfs/setup-image
@@ -4,14 +4,19 @@
 
 install_packages()
 {
+	packages=$(</tmp/packages-to-install 2>/dev/null || echo "")
+	[ -z "$packages" ] && return 0
+	
+	echo "Installing packages: $packages"
+	
 	if [ $(command -v yum) >/dev/null ]; then
-		yum install -y --skip-broken $(</tmp/packages-to-install)
+		yum install -y --skip-broken $packages
 		yum clean all
 	elif [ $(command -v apt-get) >/dev/null ]; then
 		apt update
-		apt-get install -y --fix-missing $(</tmp/packages-to-install)
+		apt-get install -y --fix-missing $packages
 	elif [ $(command -v pacman) >/dev/null ]; then
-		pacman -Syu --noconfirm $(</tmp/packages-to-install)
+		pacman -Syu --noconfirm $packages
 	fi
 }
 
diff --git a/container/osimage/create-image b/container/osimage/create-image
index b50470075..c6cebf0f2 100755
--- a/container/osimage/create-image
+++ b/container/osimage/create-image
@@ -4,7 +4,12 @@
 
 install_packages()
 {
-	yum -y install --skip-broken $(</tmp/packages-to-install)
+	packages=$(</tmp/packages-to-install 2>/dev/null || echo "")
+	[ -z "$packages" ] && return 0
+	
+	echo "Installing packages: $packages"
+	
+	yum -y install --skip-broken $packages
 	yum clean all
 }
 
-- 
Gitee


From 485c152413c427e113f780bd722bbde9bf680575 Mon Sep 17 00:00:00 2001
From: Libres-coder <2597242922@qq.com>
Date: Wed, 17 Sep 2025 21:05:04 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E8=B0=83=E6=95=B4=EF=BC=9Alocal=E5=8F=98?=
 =?UTF-8?q?=E9=87=8F=E4=B8=8E=E6=96=87=E4=BB=B6=E6=A3=80=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 container/docker2rootfs/setup-image | 5 ++++-
 container/osimage/create-image      | 5 ++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/container/docker2rootfs/setup-image b/container/docker2rootfs/setup-image
index 72723d02f..d14046a7d 100755
--- a/container/docker2rootfs/setup-image
+++ b/container/docker2rootfs/setup-image
@@ -4,7 +4,10 @@
 
 install_packages()
 {
-	packages=$(</tmp/packages-to-install 2>/dev/null || echo "")
+	local packages
+	if [ -f /tmp/packages-to-install ]; then
+		packages=$(</tmp/packages-to-install)
+	fi
 	[ -z "$packages" ] && return 0
 	
 	echo "Installing packages: $packages"
diff --git a/container/osimage/create-image b/container/osimage/create-image
index c6cebf0f2..36efb4f1f 100755
--- a/container/osimage/create-image
+++ b/container/osimage/create-image
@@ -4,7 +4,10 @@
 
 install_packages()
 {
-	packages=$(</tmp/packages-to-install 2>/dev/null || echo "")
+	local packages
+	if [ -f /tmp/packages-to-install ]; then
+		packages=$(</tmp/packages-to-install)
+	fi
 	[ -z "$packages" ] && return 0
 	
 	echo "Installing packages: $packages"
-- 
Gitee