From f980d5448c02ff64cdbff91adce4c70108810803 Mon Sep 17 00:00:00 2001
From: bin456789 <bin456789@gmail.com>
Date: Fri, 4 Aug 2023 00:07:45 +0800
Subject: [PATCH] =?UTF-8?q?core:=20=E5=AE=8C=E5=96=84=20cloud=20image=20?=
 =?UTF-8?q?=E6=A8=A1=E5=BC=8F=E5=86=85=E5=AD=98=E6=A3=80=E6=9F=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 reinstall.sh | 34 +++++++++++++++++++++-------------
 1 file changed, 21 insertions(+), 13 deletions(-)

diff --git a/reinstall.sh b/reinstall.sh
index 0e5df42..90caf72 100644
--- a/reinstall.sh
+++ b/reinstall.sh
@@ -565,25 +565,25 @@ check_ram() {
         fi
     fi
 
-    case "$distro" in
-    alpine) ram_requirement=0 ;; # 未测试
-    debian) ram_requirement=384 ;;
-    *) ram_requirement=1024 ;;
-    esac
-
     if [ -z $ram_size ] || [ $ram_size -le 0 ]; then
         error_and_exit "Could not detect RAM size."
     fi
 
+    case "$distro" in
+    alpine) ram_installer=0 ;; # 未测试
+    debian) ram_installer=384 ;;
+    *) ram_installer=1024 ;;
+    esac
+    ram_cloud_image=512
+
     # ram 足够就用普通方法安装，否则如果内存大于512就用 cloud image
-    if [ $ram_size -lt $ram_requirement ]; then
-        # TODO: 测试 256 384 内存
-        ram_requirement=512
-        if false && [ $ram_size -ge $ram_requirement ]; then
-            info "RAM < $ram_requirement MB. Switch to cloud image mode"
+    # TODO: 测试 256 384 内存
+    if [ $ram_size -lt $ram_cloud_image ]; then
+        if [ $ram_size -ge $ram_cloud_image ]; then
+            info "RAM < $ram_installer MB. Switch to cloud image mode"
             cloud_image=1
         else
-            error_and_exit "Could not install $distro: RAM < $ram_requirement MB."
+            error_and_exit "Could not install $distro: RAM < $ram_cloud_image MB."
         fi
     fi
 }
@@ -757,7 +757,7 @@ if is_in_alpine; then
 fi
 
 # 检查内存
-if ! (is_use_cloud_image || is_use_dd); then
+if ! { [ "$distro" = dd ] || [ "$distro" = windows ]; }; then
     check_ram
 fi
 
@@ -1000,4 +1000,12 @@ else
     $(command -v grub-reboot grub2-reboot) reinstall
 fi
 
+if is_use_cloud_image; then
+    info 'cloud image mode'
+elif is_use_dd; then
+    info 'dd mode'
+else
+    info 'installer mode'
+fi
+
 info 'Please reboot to begin the installation'