diff --git a/README.md b/README.md
index 683ccf0bfec87bbe0ff69998b57a0c4ceef88aa3..d58df16d9bc6a91736da52a4fe31c63ee95fd637 100755
--- a/README.md
+++ b/README.md
@@ -1,28 +1,36 @@
 ### 是什么
 
-云刻是一个针对信创环境的一键PXE安装环境。兼容c86、arm64、loogarch64架构。纯python实现http、dhcp、tftp服务，搭配系统nfs服务。通过网络引导给桌面终端和服务器安装操作系统。
+云刻是一个针对信创环境的一键PXE安装环境。兼容x86_64、ARM64、LoongArch64架构。纯Python实现HTTP、DHCP、TFTP服务，搭配系统NFS服务。通过网络引导给桌面终端和服务器安装操作系统。
 
 #### 效果图
 
 ![Image1](https://gitee.com/misstar/mpxe/raw/main/netboot/web/static/images/1.png)
 
+![Image2](https://gitee.com/misstar/mpxe/raw/main/netboot/web/static/images/2.png)
+
 ![Image3](https://gitee.com/misstar/mpxe/raw/main/netboot/web/static/images/3.png)
 
 ![Image4](https://gitee.com/misstar/mpxe/raw/main/netboot/web/static/images/4.png)
 
-![Image2](https://gitee.com/misstar/mpxe/raw/main/netboot/web/static/images/2.png)
+![Image5](https://gitee.com/misstar/mpxe/raw/main/netboot/web/static/images/5.png)
+
+![Image6](https://gitee.com/misstar/mpxe/raw/main/netboot/web/static/images/6.png)
+
+![Image7](https://gitee.com/misstar/mpxe/raw/main/netboot/web/static/images/7.png)
 
 ### 功能列表
 
 | 功能 | 说明 |
 | ---- | ---- |
 | **多架构PXE引导** | 支持 x86_64、ARM64、LoongArch64 架构的网络引导 |
-| **多镜像管理** | 支持同时配置多个ISO镜像，通过Web界面切换选择 |
+| **多镜像管理** | 支持同时配置多个ISO镜像，通过引导菜单切换选择 |
+| **GRUB2网络引导** | 从iPXE迁移到GRUB2，兼容更多机型与固件 |
 | **无人值守安装** | 支持自动应答文件（Preseed/Kickstart），实现全程自动安装 |
 | **安装进度监控** | 实时监控客户端安装进度和状态 |
 | **外挂文件** | 支持附加外部文件到镜像，满足自定义需求 |
 | **NFS网络启动** | 通过NFS服务提供镜像文件，支持大文件高效传输 |
 | **DHCP黑白名单** | 可配置MAC地址黑白名单，控制客户端访问权限 |
+| **租约持久化** | 服务重启后恢复DHCP租约记录，避免客户端断开连接后无法重新连接 |
 | **HTTP端口修改** | 支持自定义HTTP服务端口 |
 | **日志查看** | Web界面实时查看服务运行日志 |
 | **多系统兼容** | 兼容银河麒麟、OpenEuler、CentOS、Anolis、Deepin、UOS等国产系统 |
@@ -49,10 +57,13 @@
 
 #### 解压并复制镜像
 
--下载之后解压，解压之后目录结果如下：
+下载之后解压，解压之后目录结构如下：
 
 ```
 ├── config
+│   ├── config.json          # 服务运行配置
+│   ├── leases.json          # DHCP 租约记录
+│   └── install_status.json  # 客户端安装状态
 ├── iso
 ├── LICENSE.md
 ├── logs
@@ -61,23 +72,24 @@
 ├── README.md
 ├── run.py
 ├── scripts
-├── services
-└── tasklist.md
+└── services
 ```
 
 - 复制系统镜像到iso目录，也可以使用`ln -s`命令从其他目录软链接过来。
 #### 安装nfs服务
 
-mPXE依赖系统自带nfs服务，启动服务前需要安装好nfs服务。安装即可，不需要配置和手动起服务。
-服务器：
+MPXE依赖系统自带nfs服务，启动服务前需要安装好nfs服务。安装即可，不需要配置和手动起服务。
+
+##### 安装步骤
+银河麒麟服务器/openeuler/centos/anolis/uos服务器等系统：
 
-> sudo yum install nfs-utils
+> sudo yum/dnf install nfs-utils
 
-桌面系统：
+银河麒麟桌面/debian/ubuntu/deepin/uos桌面等系统：
 
 > sudo apt install nfs-kernel-server
 
-#### 启动服务
+#### 启动MPXE服务
 
 ##### 图形化环境
 
@@ -89,13 +101,18 @@ cd到解压出来的文件夹，执行命令：`sudo python3 run.py`
 
 #### 检查服务
 
-浏览器输入`http://ip/`打开管理页面，检查服务状态。
+浏览器输入`http://ip:port/`(默认端口为80)打开管理页面，检查服务状态。
 
 ### 注意事项
 
+#### 只适配UEFI引导
+
+> 云刻只支持UEFI引导，不支持BIOS引导。
+> VMware虚拟机中需要手动修改为UEFI引导，否则无法引导。
+
 #### 关闭自动睡眠
 
-设置-电源-此段时间后系统进入睡眠-永不
+> 设置-电源-此段时间后系统进入睡眠-永不
 
 #### 关闭防火墙
 
@@ -108,15 +125,15 @@ cd到解压出来的文件夹，执行命令：`sudo python3 run.py`
 
 ##### 银河麒麟服务器系统
 
-关闭防火墙服务：`systemctl disabled firewalld --now`
+关闭防火墙服务：`systemctl disable firewalld --now`
 
 #### 开放端口
-| 端口 | 协议 | 用途               |
-| ---- | ---- | ------------------ |
-| 80   | tcp  | http服务、管理页面 |
-|  67	|udp|dhcp服务|
-| 69| udp | tftp服务|
-|111,2049|tcp|nfs服务|
+| 端口 | 协议 | 用途 |
+| ---- | ---- | ---- |
+| 80 | tcp | HTTP服务、管理页面 |
+| 67 | udp | DHCP服务 |
+| 69 | udp | TFTP服务 |
+| 111, 2049 | tcp | NFS服务 |
 
 ### 常见问题
 #### Q:桌面无人值守安装过程中设置账号密码
@@ -130,7 +147,7 @@ cd到解压出来的文件夹，执行命令：`sudo python3 run.py`
 Q群：390480890
 
 ### 致谢
-ipxe/pypxe/grub/uefi 等开源项目
+pypxe/grub/uefi 等开源项目
 
 
 ### 测试列表
@@ -146,4 +163,7 @@ ipxe/pypxe/grub/uefi 等开源项目
 |凝思|6_el22|:white_check_mark:|:white_check_mark:|:white_check_mark:|:white_check_mark:|
 |deepin|25|:white_check_mark:|:white_check_mark:|:white_check_mark:|:white_check_mark:|
 |UOS桌面|1060/1070|:white_check_mark:|:x:|:x:|:white_check_mark:|
-|UOS服务器|1070|:white_check_mark:|:white_check_mark:|:white_check_mark:|:white_check_mark:|
\ No newline at end of file
+|UOS服务器|1070|:white_check_mark:|:white_check_mark:|:white_check_mark:|:white_check_mark:|
+|中科方德|5.0|:white_check_mark:|:x:|:x:|:white_check_mark:|
+|ctyun|2.0|:white_check_mark:|:white_check_mark:|:white_check_mark:|:white_check_mark:|
+|BCLinux|21.10|:white_check_mark:|:white_check_mark:|:white_check_mark:|:white_check_mark:|
\ No newline at end of file
diff --git a/config/example_cfg.json b/config/example_cfg.json
index ec603322b55eb65f5531b85bf39b56c8655d0ef4..e2048e61d0f77ce8aa1f222b1f9818230b06d874 100755
--- a/config/example_cfg.json
+++ b/config/example_cfg.json
@@ -13,7 +13,8 @@
     "DHCP_WHITELIST": [],
     "DHCP_BLACKLIST": [],
     "HTTP_PORT": 80,
-    "LEASES_FILE": "",
+    "LEASES_FILE": "config/leases.json",
+    "DHCP_LEASE_DURATION": 7200,
     "LOG_LEVEL": "INFO",
     "NETBOOT_DIR": "netboot",
     "NETBOOT_FILE": "",
@@ -24,7 +25,6 @@
     "TFTP_SERVER_IP": "10.10.10.10",
     "USE_DHCP": true,
     "USE_HTTP": true,
-    "USE_IPXE": true,
     "USE_TFTP": true,
     "MENU_DEFAULT": "",
     "MENU_TIMEOUT": "1200"
diff --git a/config/foot.ipxe b/config/foot.ipxe
deleted file mode 100755
index 80d1a5f45e519f3c95d8df3d0c24ba75f3978c05..0000000000000000000000000000000000000000
--- a/config/foot.ipxe
+++ /dev/null
@@ -1,45 +0,0 @@
-  item --gap --             -------------------------------- Advanced -----------------------------
-  item --key h local        [H]Boot from local drive
-  item --key s shell 		[S] Drop to iPXE Shell
-  item --key r reboot		[R] Reboot the Computer
-  item --key x exit			[X] Exit iPXE and Continue BIOS Booting
-  item --key c config       [C]Configure settings
-
-#在默认时间到时选择默认启动项
-  choose --timeout ${menu-timeout} --default ${menu-default} selected
-  goto ${selected}
-
-#============ Main Menu Options =============
-#uefi 模式下，需要在kernel指定initrd
-
-#PE镜像启动代码块==============================
-
-:retry
-  imgfree
-  prompt Error! press any key to retry
-  goto start
-#PE镜像启动代码块==============================
-
-
-#从本地硬盘启动
-:local
-  sanboot --no-describe --drive 0x80
-
-#打开命令行
-:shell
-  echo Type 'exit' to go back to the menu.
-  shell
-  goto start
-
-#重启
-:reboot
-  reboot
-
-#退出
-:exit
-  exit
-
-#配置
-:config
-  config
-  goto start
diff --git a/config/footer_grub.cfg b/config/footer_grub.cfg
new file mode 100644
index 0000000000000000000000000000000000000000..de7e54af13e0620a33b621ec43d81b8e9d81eb51
--- /dev/null
+++ b/config/footer_grub.cfg
@@ -0,0 +1,9 @@
+# ====== Advanced 选项 ======
+menuentry "Boot from local drive" --class local --hotkey h {
+    exit
+}
+
+menuentry "Reboot" --class reboot --hotkey r {
+    reboot
+}
+
diff --git a/config/header.ipxe b/config/header.ipxe
deleted file mode 100755
index 4b3e26c43988803b0e4362eed8dc08b47a36e7cd..0000000000000000000000000000000000000000
--- a/config/header.ipxe
+++ /dev/null
@@ -1,25 +0,0 @@
-#!ipxe
-#============== Set Variables ===============
-#设置默认时间
-   set menu-timeout 1024000
-#判断启动平台的方式，设定默认启动项
-#   iseq ${platform} efi && set menu-default win64 || set menu-default win32
-   set menu-default MENU_DEFAULT
-   set menu-timeout MENU_TIMEOUT
-#将http用xieyi代替
-   set xieyi:string http
-#自动获取IP
-   dhcp
-#测试是否存在dhcp服务器，否则指定next-server为服务器IP
-   isset ${next-server} || set next-server SERVER_IP_ADDRESS
-
-   #iseq ${buildarch} x86_64 &&  console --picture http://${next-server}:HTTP_PORT/images/background.png || goto start
-   console --picture http://${next-server}:HTTP_PORT/images/background.png || goto start
-
-#============== Set Menu ===============
-#菜单开始标记
-:start
-#显示menu标题，并显示平台和ip地址
-  menu Misstar-PXE (${ip})  onion@misstar.com
-#列项，可以指定热键，别名，添加--gap --分割线
-  item --gap --             -------------------------------- ${product} ---------------------------
diff --git a/config/header_grub.cfg b/config/header_grub.cfg
new file mode 100755
index 0000000000000000000000000000000000000000..daad04c7cf26d0bedfc3a78fc4e7dfe64110ae74
--- /dev/null
+++ b/config/header_grub.cfg
@@ -0,0 +1,51 @@
+# ====================
+# 1. 先加载所有视频/图形模块
+# ====================
+insmod all_video
+insmod efi_gop
+insmod efi_uga
+insmod video_bochs
+insmod video_cirrus
+insmod gfxterm
+insmod gfxmenu
+insmod png
+insmod font
+insmod net
+insmod efinet
+insmod http
+insmod part_gpt
+insmod ext2
+insmod fat
+
+# ====================
+# 2. 设置分辨率
+# ====================
+set gfxmode="1920x1080,1376x768,1152x864,1024x768,auto"
+set gfxpayload=keep
+
+# ====================
+# 3. 启动终端
+#    mips64el 下 gfxterm 会导致花屏，使用 console 替代
+#    其他架构正常使用 gfxterm 显示图形界面
+# ====================
+if [ "$grub_cpu" = "mips64el" ]; then
+    terminal_output console
+else
+    terminal_output gfxterm
+fi
+
+# ====================
+# 4. 最后加载：字体 → 背景 → 主题
+# ====================
+loadfont ($root)/themes/mpxe/unicode.pf2
+set theme=($root)/themes/mpxe/theme.txt
+
+# ====================
+# 5. 菜单默认项
+# ====================
+set default=MENU_DEFAULT
+
+# ====================
+# 6. 菜单超时时间
+# ====================
+set timeout=MENU_TIMEOUT
\ No newline at end of file
diff --git a/netboot/autoexec.ipxe b/netboot/autoexec.ipxe
deleted file mode 120000
index 3e1b7f512ae9ed9688a4f8f2ce66bf8acc6d3164..0000000000000000000000000000000000000000
--- a/netboot/autoexec.ipxe
+++ /dev/null
@@ -1 +0,0 @@
-boot.ipxe
\ No newline at end of file
diff --git a/netboot/images/background.png b/netboot/images/background.png
deleted file mode 100644
index 9e4ef307087d0f7493775e2de95cd31b08ffd6bb..0000000000000000000000000000000000000000
Binary files a/netboot/images/background.png and /dev/null differ
diff --git a/netboot/ipxe_efi/arm64.efi b/netboot/ipxe_efi/arm64.efi
deleted file mode 100755
index 879c009ef74193066532af89329a48bce6c90a2b..0000000000000000000000000000000000000000
Binary files a/netboot/ipxe_efi/arm64.efi and /dev/null differ
diff --git a/netboot/ipxe_efi/loongarch64.efi b/netboot/ipxe_efi/loongarch64.efi
deleted file mode 100755
index 042ba39f9a3887bcea71b5de1b6a24c2a128f66a..0000000000000000000000000000000000000000
Binary files a/netboot/ipxe_efi/loongarch64.efi and /dev/null differ
diff --git a/netboot/ipxe_efi/x86_64.efi b/netboot/ipxe_efi/x86_64.efi
deleted file mode 100755
index 6e5057609192eed01a6c77b8031e00af30d55c9d..0000000000000000000000000000000000000000
Binary files a/netboot/ipxe_efi/x86_64.efi and /dev/null differ
diff --git a/netboot/mips64el/KlConfig.cfg b/netboot/mips64el/KlConfig.cfg
deleted file mode 100755
index 2d0a1a46c02d9ff9974dc42e4829e01d8c3f6153..0000000000000000000000000000000000000000
--- a/netboot/mips64el/KlConfig.cfg
+++ /dev/null
@@ -1 +0,0 @@
-boot=casper ro locale=zh_CN KEYBOARDTYPE=pc KEYTABLE=us console=tty audit=0 netboot=nfs nfsroot=192.168.1.1:/opt/nfs/mips64-kylin/ security=
\ No newline at end of file
diff --git a/netboot/mips64el/core.efi b/netboot/mips64el/core.efi
deleted file mode 100755
index e40266af9133150a6d290e9c00587c8d1e03dbcb..0000000000000000000000000000000000000000
Binary files a/netboot/mips64el/core.efi and /dev/null differ
diff --git a/netboot/mips64el/grub2/grub.cfg b/netboot/mips64el/grub2/grub.cfg
deleted file mode 100755
index 67d3bd11d7f436fec03a399f9e6090421298920e..0000000000000000000000000000000000000000
--- a/netboot/mips64el/grub2/grub.cfg
+++ /dev/null
@@ -1,15 +0,0 @@
-set default 0
-set timeout=5
-set menu_color_normal=white/black
-set menu_color_highlight=yellow/black
-
-menuentry "Try Kylin-Desktop V10 without installing" {
-linux /vmlinuz console=tty1 boot=casper quiet splash loglevel=0 audit=0 netboot=nfs nfsroot=192.168.1.1:/opt/nfs/mips64-kylin security=
-initrd /initrd.img
-}
-
-menuentry 'Install Kylin-Desktop V10'{
-linux /vmlinuz console=tty1 boot=casper quiet splash loglevel=0 only-ubiquity audit=0 netboot=nfs nfsroot=192.168.1.1:/opt/nfs/mips64-kylin security=
-initrd /initrd.img
-}
-
diff --git a/netboot/mips64el/pxelinux.0 b/netboot/mips64el/pxelinux.0
deleted file mode 100755
index b3ead7fccf6e3151438a90125334008b610f3757..0000000000000000000000000000000000000000
--- a/netboot/mips64el/pxelinux.0
+++ /dev/null
@@ -1,6 +0,0 @@
-bootentry Try Kylin Desktop V10
-{
-boot vmlinuz
-initrd initrd.img
-args boot=casper ro locale=zh_CN KEYBOARDTYPE=pc KEYTABLE=us console=tty audit=0 netboot=nfs nfsroot=192.168.1.1:/opt/nfs/mips64-kylin/ security=
-}
diff --git a/netboot/monitor/hooks.sh.tpl b/netboot/monitor/hooks.sh.tpl
index f24f485371538ac954c8dca9268add3a8c5f6195..e615880f3812fa378aa62be19c5b6f78220212f8 100755
--- a/netboot/monitor/hooks.sh.tpl
+++ b/netboot/monitor/hooks.sh.tpl
@@ -1,17 +1,40 @@
 #!/bin/bash
 set -e 
 
+# ========== HTTP 工具检测 ==========
+HTTP_TOOL=""
+if command -v curl &>/dev/null; then
+    HTTP_TOOL="curl"
+elif command -v wget &>/dev/null; then
+    HTTP_TOOL="wget"
+else
+    echo "[$(date +'%Y-%m-%d %H:%M:%S')] ERROR: 未找到 curl 或 wget 命令，退出安装钩子"
+    exit 0
+fi
+
 DOWNLOAD_URL="http://SERVER_IP_ADDRESS:HTTP_PORT/monitor/monitor.sh"
 DEST_SCRIPT="/tmp/monitor_daemon.sh"
 RETRY=3
 while [ ${RETRY} -gt 0 ]; do
     if [[ -f "/usr/bin/sudo" ]];then
-        if sudo curl -4s --connect-timeout 10 "${DOWNLOAD_URL}" -o "${DEST_SCRIPT}"; then
-            break
+        if [ "$HTTP_TOOL" = "curl" ]; then
+            if sudo curl -4s --connect-timeout 10 "${DOWNLOAD_URL}" -o "${DEST_SCRIPT}"; then
+                break
+            fi
+        else
+            if sudo wget -q --timeout=10 "${DOWNLOAD_URL}" -O "${DEST_SCRIPT}"; then
+                break
+            fi
         fi
     else
-        if curl -4s --connect-timeout 10 "${DOWNLOAD_URL}" -o "${DEST_SCRIPT}"; then
-            break
+        if [ "$HTTP_TOOL" = "curl" ]; then
+            if curl -4s --connect-timeout 10 "${DOWNLOAD_URL}" -o "${DEST_SCRIPT}"; then
+                break
+            fi
+        else
+            if wget -q --timeout=10 "${DOWNLOAD_URL}" -O "${DEST_SCRIPT}"; then
+                break
+            fi
         fi
     fi
     RETRY=$((RETRY-1))
diff --git a/netboot/monitor/monitor.cfg.tpl b/netboot/monitor/monitor.cfg.tpl
index 0a2622666231d0dd3d3db0d08cc2ee04d7b72ae5..2456f9d468b2c1497433208f8810df3dd6e0db38 100755
--- a/netboot/monitor/monitor.cfg.tpl
+++ b/netboot/monitor/monitor.cfg.tpl
@@ -1,10 +1,11 @@
 #ANACONDA  %pre 段（嵌入到 ks.cfg 中）
 firstboot --enable
 lang zh_CN.UTF-8
+keyboard --xlayouts='cn'
 timezone Asia/Shanghai
 
 
 %packages
-@^kylin-desktop-environment
+@^minimal-environment
 %end
 %pre --log=/tmp/pre_download.log
diff --git a/netboot/monitor/monitor.sh.tpl b/netboot/monitor/monitor.sh.tpl
index 0b039e23b6072da5156f0e0c5317fa88efd87763..71d6e8e4252c065e7ccd0b2c941361ed92476177 100755
--- a/netboot/monitor/monitor.sh.tpl
+++ b/netboot/monitor/monitor.sh.tpl
@@ -12,6 +12,39 @@ MONITOR_SERVER="http://SERVER_IP_ADDRESS:HTTP_PORT"
 total_pkgs=0
 declare -gA DICT
 
+# ========== HTTP 工具检测 ==========
+HTTP_TOOL=""
+if command -v curl &>/dev/null; then
+    HTTP_TOOL="curl"
+elif command -v wget &>/dev/null; then
+    HTTP_TOOL="wget"
+else
+    echo "[$(date +'%Y-%m-%d %H:%M:%S')] ERROR: 未找到 curl 或 wget 命令，退出监控"
+    exit 0
+fi
+
+# HTTP GET 下载函数
+http_get() {
+    local url="$1"
+    local output="$2"
+    if [ "$HTTP_TOOL" = "curl" ]; then
+        curl -s --connect-timeout 2 -o "$output" "$url"
+    else
+        wget -q --timeout=2 -O "$output" "$url"
+    fi
+}
+
+# HTTP POST 请求函数
+http_post() {
+    local url="$1"
+    local data="$2"
+    if [ "$HTTP_TOOL" = "curl" ]; then
+        curl -X POST -s --connect-timeout 2 -d "$data" -o /dev/null "$url"
+    else
+        wget -q --timeout=2 --post-data="$data" -O /dev/null "$url"
+    fi
+}
+
 # ========== 日志函数 ==========
 log_info() {
     echo "[$(date +'%Y-%m-%d %H:%M:%S')] [${CLIENT_ID}] INFO: $1" >> ${MONITOR_LOG}
@@ -155,11 +188,11 @@ main() {
     log_info "识别系统类型：$os"
     if [ "$os" = "unknown" ]; then
         log_error "无法识别系统类型，退出监控"
-        curl -X POST -s --connect-timeout 2 -d "progress=100&status=failed&msg=系统类型未识别&mac=$MAC" -o /dev/null $MONITOR_SERVER/monitor/statusreport
+        http_post "$MONITOR_SERVER/monitor/statusreport" "progress=100&status=failed&msg=系统类型未识别&mac=$MAC"
         exit 1
     fi
     
-    curl -s --connect-timeout 2 -o /tmp/monitor.dict $MONITOR_SERVER/monitor/dicts/$os".dict"
+    http_get "$MONITOR_SERVER/monitor/dicts/$os.dict" "/tmp/monitor.dict"
     log_info "已下载字典文件"
 
     local dict_file="/tmp/monitor.dict"
@@ -174,7 +207,7 @@ main() {
         local msg=$(echo "$result" | awk '{$1="";$2="";print substr($0,3)}')
 
         [ "$progress" -ne "$last_progress" ] && log_info "进度：${progress}% | 状态：${status} | 信息：${msg}" && last_progress=$progress
-        curl -X POST -s --connect-timeout 2 -d "progress=$progress&status=$status&msg=$msg&mac=$MAC" -o /dev/null $MONITOR_SERVER/monitor/statusreport
+        http_post "$MONITOR_SERVER/monitor/statusreport" "progress=$progress&status=$status&msg=$msg&mac=$MAC"
 
         [ "$status" = "finished" ] || [ "$status" = "failed" ] && log_info "监控脚本正常退出，最终状态：$status" && break
         sleep ${MONITOR_INTERVAL}
diff --git a/netboot/themes/mpxe/background.png b/netboot/themes/mpxe/background.png
new file mode 100644
index 0000000000000000000000000000000000000000..ea845bdd4639ba644a07f614d6f5499b9664d645
Binary files /dev/null and b/netboot/themes/mpxe/background.png differ
diff --git a/netboot/themes/mpxe/dejavu_32.pf2 b/netboot/themes/mpxe/dejavu_32.pf2
new file mode 100644
index 0000000000000000000000000000000000000000..ab25446a22c15633d874d534f27a0eafda6a2a15
Binary files /dev/null and b/netboot/themes/mpxe/dejavu_32.pf2 differ
diff --git a/netboot/themes/mpxe/dejavu_sans_12.pf2 b/netboot/themes/mpxe/dejavu_sans_12.pf2
new file mode 100644
index 0000000000000000000000000000000000000000..19e04993bf361c27ea93897c5ecd99e6da1db561
Binary files /dev/null and b/netboot/themes/mpxe/dejavu_sans_12.pf2 differ
diff --git a/netboot/themes/mpxe/dejavu_sans_14.pf2 b/netboot/themes/mpxe/dejavu_sans_14.pf2
new file mode 100644
index 0000000000000000000000000000000000000000..dcc727e15e3116c94a8beca811d332423320b8af
Binary files /dev/null and b/netboot/themes/mpxe/dejavu_sans_14.pf2 differ
diff --git a/netboot/themes/mpxe/dejavu_sans_16.pf2 b/netboot/themes/mpxe/dejavu_sans_16.pf2
new file mode 100644
index 0000000000000000000000000000000000000000..37f3ef4268419eeade0047c7766112eb04f63c80
Binary files /dev/null and b/netboot/themes/mpxe/dejavu_sans_16.pf2 differ
diff --git a/netboot/themes/mpxe/dejavu_sans_24.pf2 b/netboot/themes/mpxe/dejavu_sans_24.pf2
new file mode 100644
index 0000000000000000000000000000000000000000..8c3e434040f02f8199a2accefdfd358201389846
Binary files /dev/null and b/netboot/themes/mpxe/dejavu_sans_24.pf2 differ
diff --git a/netboot/themes/mpxe/dejavu_sans_48.pf2 b/netboot/themes/mpxe/dejavu_sans_48.pf2
new file mode 100644
index 0000000000000000000000000000000000000000..776c98224be89ab576e0c9fe3d5bb1098d51a244
Binary files /dev/null and b/netboot/themes/mpxe/dejavu_sans_48.pf2 differ
diff --git a/netboot/themes/mpxe/icons/Manjaro.i686.png b/netboot/themes/mpxe/icons/Manjaro.i686.png
new file mode 100644
index 0000000000000000000000000000000000000000..79643c4b8e055a9531f1addd75c2c29b77907860
Binary files /dev/null and b/netboot/themes/mpxe/icons/Manjaro.i686.png differ
diff --git a/netboot/themes/mpxe/icons/Manjaro.x86_64.png b/netboot/themes/mpxe/icons/Manjaro.x86_64.png
new file mode 100644
index 0000000000000000000000000000000000000000..79643c4b8e055a9531f1addd75c2c29b77907860
Binary files /dev/null and b/netboot/themes/mpxe/icons/Manjaro.x86_64.png differ
diff --git a/netboot/themes/mpxe/icons/anolis.png b/netboot/themes/mpxe/icons/anolis.png
new file mode 100644
index 0000000000000000000000000000000000000000..c36f96050c603e6679da837e84cd8449a09e2d4f
Binary files /dev/null and b/netboot/themes/mpxe/icons/anolis.png differ
diff --git a/netboot/themes/mpxe/icons/antergos.png b/netboot/themes/mpxe/icons/antergos.png
new file mode 100644
index 0000000000000000000000000000000000000000..f388d80f7ad4d115dd4b732cd3e2a01fb5fe02d8
Binary files /dev/null and b/netboot/themes/mpxe/icons/antergos.png differ
diff --git a/netboot/themes/mpxe/icons/arch.png b/netboot/themes/mpxe/icons/arch.png
new file mode 100644
index 0000000000000000000000000000000000000000..a86a16236eec35f1b8b6bdd9b52c6c67dc1b25d4
Binary files /dev/null and b/netboot/themes/mpxe/icons/arch.png differ
diff --git a/netboot/themes/mpxe/icons/archlinux.png b/netboot/themes/mpxe/icons/archlinux.png
new file mode 100644
index 0000000000000000000000000000000000000000..a86a16236eec35f1b8b6bdd9b52c6c67dc1b25d4
Binary files /dev/null and b/netboot/themes/mpxe/icons/archlinux.png differ
diff --git a/netboot/themes/mpxe/icons/arcolinux.png b/netboot/themes/mpxe/icons/arcolinux.png
new file mode 100644
index 0000000000000000000000000000000000000000..213090a0b60f03505cc644f50f0b2ff57d2c7499
Binary files /dev/null and b/netboot/themes/mpxe/icons/arcolinux.png differ
diff --git a/netboot/themes/mpxe/icons/cancel.png b/netboot/themes/mpxe/icons/cancel.png
new file mode 100644
index 0000000000000000000000000000000000000000..c352c9aca7c2b657fbcf8c862d92506ca9c7096f
Binary files /dev/null and b/netboot/themes/mpxe/icons/cancel.png differ
diff --git a/netboot/themes/mpxe/icons/chakra.png b/netboot/themes/mpxe/icons/chakra.png
new file mode 100644
index 0000000000000000000000000000000000000000..940053ab183e8e600732a124e6536ab2b5522bd6
Binary files /dev/null and b/netboot/themes/mpxe/icons/chakra.png differ
diff --git a/netboot/themes/mpxe/icons/ctyunos.png b/netboot/themes/mpxe/icons/ctyunos.png
new file mode 100644
index 0000000000000000000000000000000000000000..c36f96050c603e6679da837e84cd8449a09e2d4f
Binary files /dev/null and b/netboot/themes/mpxe/icons/ctyunos.png differ
diff --git a/netboot/themes/mpxe/icons/debian.png b/netboot/themes/mpxe/icons/debian.png
new file mode 100644
index 0000000000000000000000000000000000000000..4f503c1793ae86ea0561ce4e0e1e1e4c315e0164
Binary files /dev/null and b/netboot/themes/mpxe/icons/debian.png differ
diff --git a/netboot/themes/mpxe/icons/deepin.png b/netboot/themes/mpxe/icons/deepin.png
new file mode 100644
index 0000000000000000000000000000000000000000..a0607e1098416973cd1d401c94b264973b3505d8
Binary files /dev/null and b/netboot/themes/mpxe/icons/deepin.png differ
diff --git a/netboot/themes/mpxe/icons/devuan.png b/netboot/themes/mpxe/icons/devuan.png
new file mode 100644
index 0000000000000000000000000000000000000000..a3490a1a936b3648001fc94c9b7dfb418dbdd5cc
Binary files /dev/null and b/netboot/themes/mpxe/icons/devuan.png differ
diff --git a/netboot/themes/mpxe/icons/driver.png b/netboot/themes/mpxe/icons/driver.png
new file mode 100644
index 0000000000000000000000000000000000000000..db8a364efce428b80b078ab39b354ac3542fb6bd
Binary files /dev/null and b/netboot/themes/mpxe/icons/driver.png differ
diff --git a/netboot/themes/mpxe/icons/edit.png b/netboot/themes/mpxe/icons/edit.png
new file mode 100644
index 0000000000000000000000000000000000000000..2109dc49b18f7d252cffda588b5db695015b2dc2
Binary files /dev/null and b/netboot/themes/mpxe/icons/edit.png differ
diff --git a/netboot/themes/mpxe/icons/efi.png b/netboot/themes/mpxe/icons/efi.png
new file mode 100644
index 0000000000000000000000000000000000000000..1085045bd70b70d5573d9cf5c2d725105c540ada
Binary files /dev/null and b/netboot/themes/mpxe/icons/efi.png differ
diff --git a/netboot/themes/mpxe/icons/elementary.png b/netboot/themes/mpxe/icons/elementary.png
new file mode 100644
index 0000000000000000000000000000000000000000..4543a9229c77cb74971599e57e9db4f4c27ca11c
Binary files /dev/null and b/netboot/themes/mpxe/icons/elementary.png differ
diff --git a/netboot/themes/mpxe/icons/endeavouros.png b/netboot/themes/mpxe/icons/endeavouros.png
new file mode 100644
index 0000000000000000000000000000000000000000..3d45b99873ea5aa7ed817fd00b5572628370cbd6
Binary files /dev/null and b/netboot/themes/mpxe/icons/endeavouros.png differ
diff --git a/netboot/themes/mpxe/icons/exit.png b/netboot/themes/mpxe/icons/exit.png
new file mode 100644
index 0000000000000000000000000000000000000000..c352c9aca7c2b657fbcf8c862d92506ca9c7096f
Binary files /dev/null and b/netboot/themes/mpxe/icons/exit.png differ
diff --git a/netboot/themes/mpxe/icons/fedora.png b/netboot/themes/mpxe/icons/fedora.png
new file mode 100644
index 0000000000000000000000000000000000000000..b06e6e70919d589348d759909161e9ed4ef0966a
Binary files /dev/null and b/netboot/themes/mpxe/icons/fedora.png differ
diff --git a/netboot/themes/mpxe/icons/find.efi.png b/netboot/themes/mpxe/icons/find.efi.png
new file mode 100644
index 0000000000000000000000000000000000000000..b06454ddce4c00c23c20efcc8953e18001c23892
Binary files /dev/null and b/netboot/themes/mpxe/icons/find.efi.png differ
diff --git a/netboot/themes/mpxe/icons/find.none.png b/netboot/themes/mpxe/icons/find.none.png
new file mode 100644
index 0000000000000000000000000000000000000000..3c91e9402a3b2c36cac9c71f755e4c66535c3120
Binary files /dev/null and b/netboot/themes/mpxe/icons/find.none.png differ
diff --git a/netboot/themes/mpxe/icons/gentoo.png b/netboot/themes/mpxe/icons/gentoo.png
new file mode 100644
index 0000000000000000000000000000000000000000..9fe517701835b9899310949100fbdf2db31d6c4b
Binary files /dev/null and b/netboot/themes/mpxe/icons/gentoo.png differ
diff --git a/netboot/themes/mpxe/icons/gnu-linux.png b/netboot/themes/mpxe/icons/gnu-linux.png
new file mode 100644
index 0000000000000000000000000000000000000000..c36f96050c603e6679da837e84cd8449a09e2d4f
Binary files /dev/null and b/netboot/themes/mpxe/icons/gnu-linux.png differ
diff --git a/netboot/themes/mpxe/icons/help.png b/netboot/themes/mpxe/icons/help.png
new file mode 100644
index 0000000000000000000000000000000000000000..11356dbe74399f45ae2a8abc754f88ae5f9044fd
Binary files /dev/null and b/netboot/themes/mpxe/icons/help.png differ
diff --git a/netboot/themes/mpxe/icons/kali.png b/netboot/themes/mpxe/icons/kali.png
new file mode 100644
index 0000000000000000000000000000000000000000..141bfeed8e786c301f41ed81dcb08fb1f5a8d7ef
Binary files /dev/null and b/netboot/themes/mpxe/icons/kali.png differ
diff --git a/netboot/themes/mpxe/icons/kaos.png b/netboot/themes/mpxe/icons/kaos.png
new file mode 100644
index 0000000000000000000000000000000000000000..543951202ef934cce97c9de9ad0130287ca4d84d
Binary files /dev/null and b/netboot/themes/mpxe/icons/kaos.png differ
diff --git a/netboot/themes/mpxe/icons/kbd.png b/netboot/themes/mpxe/icons/kbd.png
new file mode 100644
index 0000000000000000000000000000000000000000..5e177f78bff37a37ea89d65743a93e118693270f
Binary files /dev/null and b/netboot/themes/mpxe/icons/kbd.png differ
diff --git a/netboot/themes/mpxe/icons/korora.png b/netboot/themes/mpxe/icons/korora.png
new file mode 100644
index 0000000000000000000000000000000000000000..d1469408f5970ee7adeee1c540e9272db8c41eb1
Binary files /dev/null and b/netboot/themes/mpxe/icons/korora.png differ
diff --git a/netboot/themes/mpxe/icons/kubuntu.png b/netboot/themes/mpxe/icons/kubuntu.png
new file mode 100644
index 0000000000000000000000000000000000000000..1a4230e66d17a35c5bde9657619b7f46f2b038df
Binary files /dev/null and b/netboot/themes/mpxe/icons/kubuntu.png differ
diff --git a/netboot/themes/mpxe/icons/kylin.png b/netboot/themes/mpxe/icons/kylin.png
new file mode 100644
index 0000000000000000000000000000000000000000..831e0bae9d4d20bdcff65bab830c07c42f251cbb
Binary files /dev/null and b/netboot/themes/mpxe/icons/kylin.png differ
diff --git a/netboot/themes/mpxe/icons/lang.png b/netboot/themes/mpxe/icons/lang.png
new file mode 100644
index 0000000000000000000000000000000000000000..8051692deb8f92acf06ae600bf82efea81bb8bac
Binary files /dev/null and b/netboot/themes/mpxe/icons/lang.png differ
diff --git a/netboot/themes/mpxe/icons/lfs.png b/netboot/themes/mpxe/icons/lfs.png
new file mode 100644
index 0000000000000000000000000000000000000000..c36f96050c603e6679da837e84cd8449a09e2d4f
Binary files /dev/null and b/netboot/themes/mpxe/icons/lfs.png differ
diff --git a/netboot/themes/mpxe/icons/linux.png b/netboot/themes/mpxe/icons/linux.png
new file mode 100644
index 0000000000000000000000000000000000000000..c36f96050c603e6679da837e84cd8449a09e2d4f
Binary files /dev/null and b/netboot/themes/mpxe/icons/linux.png differ
diff --git a/netboot/themes/mpxe/icons/linuxmint.png b/netboot/themes/mpxe/icons/linuxmint.png
new file mode 100644
index 0000000000000000000000000000000000000000..0db20100453f35c860539650df2fce9eb9fd8fe7
Binary files /dev/null and b/netboot/themes/mpxe/icons/linuxmint.png differ
diff --git a/netboot/themes/mpxe/icons/local.png b/netboot/themes/mpxe/icons/local.png
new file mode 100644
index 0000000000000000000000000000000000000000..675cdf051d9d2cd0bdb2db28d4c4702fa257c8f8
Binary files /dev/null and b/netboot/themes/mpxe/icons/local.png differ
diff --git a/netboot/themes/mpxe/icons/lubuntu.png b/netboot/themes/mpxe/icons/lubuntu.png
new file mode 100644
index 0000000000000000000000000000000000000000..effcd0558054f6b3e79fc25a318f0165556fe254
Binary files /dev/null and b/netboot/themes/mpxe/icons/lubuntu.png differ
diff --git a/netboot/themes/mpxe/icons/macosx.png b/netboot/themes/mpxe/icons/macosx.png
new file mode 100644
index 0000000000000000000000000000000000000000..68ff10575156391bf1bb34cec1e45e8bd432d61c
Binary files /dev/null and b/netboot/themes/mpxe/icons/macosx.png differ
diff --git a/netboot/themes/mpxe/icons/mageia.png b/netboot/themes/mpxe/icons/mageia.png
new file mode 100644
index 0000000000000000000000000000000000000000..5133b975a4b6a128db901f471b92d05199042b24
Binary files /dev/null and b/netboot/themes/mpxe/icons/mageia.png differ
diff --git a/netboot/themes/mpxe/icons/manjaro.png b/netboot/themes/mpxe/icons/manjaro.png
new file mode 100644
index 0000000000000000000000000000000000000000..79643c4b8e055a9531f1addd75c2c29b77907860
Binary files /dev/null and b/netboot/themes/mpxe/icons/manjaro.png differ
diff --git a/netboot/themes/mpxe/icons/memtest.png b/netboot/themes/mpxe/icons/memtest.png
new file mode 100644
index 0000000000000000000000000000000000000000..db8a364efce428b80b078ab39b354ac3542fb6bd
Binary files /dev/null and b/netboot/themes/mpxe/icons/memtest.png differ
diff --git a/netboot/themes/mpxe/icons/opensuse.png b/netboot/themes/mpxe/icons/opensuse.png
new file mode 100644
index 0000000000000000000000000000000000000000..3ac99e0c8ceaedc43579e1501448787dd21c5b26
Binary files /dev/null and b/netboot/themes/mpxe/icons/opensuse.png differ
diff --git a/netboot/themes/mpxe/icons/pop-os.png b/netboot/themes/mpxe/icons/pop-os.png
new file mode 100644
index 0000000000000000000000000000000000000000..cef4e1b1f36703317625cfb26612fb7db36c7b41
Binary files /dev/null and b/netboot/themes/mpxe/icons/pop-os.png differ
diff --git a/netboot/themes/mpxe/icons/reboot.png b/netboot/themes/mpxe/icons/reboot.png
new file mode 100644
index 0000000000000000000000000000000000000000..15ba3d6e7aa7c7851e7c989db6d2cd9ec22fa9b3
Binary files /dev/null and b/netboot/themes/mpxe/icons/reboot.png differ
diff --git a/netboot/themes/mpxe/icons/recovery.png b/netboot/themes/mpxe/icons/recovery.png
new file mode 100644
index 0000000000000000000000000000000000000000..259131a73a6d942d425d259c175d5225883e7653
Binary files /dev/null and b/netboot/themes/mpxe/icons/recovery.png differ
diff --git a/netboot/themes/mpxe/icons/restart.png b/netboot/themes/mpxe/icons/restart.png
new file mode 100644
index 0000000000000000000000000000000000000000..15ba3d6e7aa7c7851e7c989db6d2cd9ec22fa9b3
Binary files /dev/null and b/netboot/themes/mpxe/icons/restart.png differ
diff --git a/netboot/themes/mpxe/icons/shutdown.png b/netboot/themes/mpxe/icons/shutdown.png
new file mode 100644
index 0000000000000000000000000000000000000000..10a9488b473f9d7eca613278a8ad68a19180ee05
Binary files /dev/null and b/netboot/themes/mpxe/icons/shutdown.png differ
diff --git a/netboot/themes/mpxe/icons/siduction.png b/netboot/themes/mpxe/icons/siduction.png
new file mode 100644
index 0000000000000000000000000000000000000000..5e4cdafde904a8af57d6675a5cba09a72ff989b6
Binary files /dev/null and b/netboot/themes/mpxe/icons/siduction.png differ
diff --git a/netboot/themes/mpxe/icons/solus.png b/netboot/themes/mpxe/icons/solus.png
new file mode 100644
index 0000000000000000000000000000000000000000..c91e6b5d45ef2826a2604528d676efc4dce2bff6
Binary files /dev/null and b/netboot/themes/mpxe/icons/solus.png differ
diff --git a/netboot/themes/mpxe/icons/steamos.png b/netboot/themes/mpxe/icons/steamos.png
new file mode 100644
index 0000000000000000000000000000000000000000..23011cdfc45a27da27c96b6db2551dd3b6a0c92a
Binary files /dev/null and b/netboot/themes/mpxe/icons/steamos.png differ
diff --git a/netboot/themes/mpxe/icons/type.png b/netboot/themes/mpxe/icons/type.png
new file mode 100644
index 0000000000000000000000000000000000000000..6e497deeaf6edbde31f0f26c12141cc48afbb038
Binary files /dev/null and b/netboot/themes/mpxe/icons/type.png differ
diff --git a/netboot/themes/mpxe/icons/tz.png b/netboot/themes/mpxe/icons/tz.png
new file mode 100644
index 0000000000000000000000000000000000000000..bd5ce0ae65f07e1b953bda3e3cb4caa7879f5a62
Binary files /dev/null and b/netboot/themes/mpxe/icons/tz.png differ
diff --git a/netboot/themes/mpxe/icons/ubuntu.png b/netboot/themes/mpxe/icons/ubuntu.png
new file mode 100644
index 0000000000000000000000000000000000000000..761defacc76a320ab0075ecd2250a43d83afd069
Binary files /dev/null and b/netboot/themes/mpxe/icons/ubuntu.png differ
diff --git a/netboot/themes/mpxe/icons/unknown.png b/netboot/themes/mpxe/icons/unknown.png
new file mode 100644
index 0000000000000000000000000000000000000000..c36f96050c603e6679da837e84cd8449a09e2d4f
Binary files /dev/null and b/netboot/themes/mpxe/icons/unknown.png differ
diff --git a/netboot/themes/mpxe/icons/unset.png b/netboot/themes/mpxe/icons/unset.png
new file mode 100644
index 0000000000000000000000000000000000000000..675cdf051d9d2cd0bdb2db28d4c4702fa257c8f8
Binary files /dev/null and b/netboot/themes/mpxe/icons/unset.png differ
diff --git a/netboot/themes/mpxe/icons/uos.png b/netboot/themes/mpxe/icons/uos.png
new file mode 100644
index 0000000000000000000000000000000000000000..a0607e1098416973cd1d401c94b264973b3505d8
Binary files /dev/null and b/netboot/themes/mpxe/icons/uos.png differ
diff --git a/netboot/themes/mpxe/icons/void.png b/netboot/themes/mpxe/icons/void.png
new file mode 100644
index 0000000000000000000000000000000000000000..91ec93459df8472974222a13834bc87b2eec8b80
Binary files /dev/null and b/netboot/themes/mpxe/icons/void.png differ
diff --git a/netboot/themes/mpxe/icons/windows.png b/netboot/themes/mpxe/icons/windows.png
new file mode 100644
index 0000000000000000000000000000000000000000..0998c59f894cd763455301b1bb31588cd3a15774
Binary files /dev/null and b/netboot/themes/mpxe/icons/windows.png differ
diff --git a/netboot/themes/mpxe/icons/xubuntu.png b/netboot/themes/mpxe/icons/xubuntu.png
new file mode 100644
index 0000000000000000000000000000000000000000..d592ee179cd753e5c320ee6930f27ba6d1f5c03d
Binary files /dev/null and b/netboot/themes/mpxe/icons/xubuntu.png differ
diff --git a/netboot/themes/mpxe/select_c.png b/netboot/themes/mpxe/select_c.png
new file mode 100644
index 0000000000000000000000000000000000000000..b1f8d580ee1ae2a9d3271da4d3886dd9b0ced71e
Binary files /dev/null and b/netboot/themes/mpxe/select_c.png differ
diff --git a/netboot/themes/mpxe/select_e.png b/netboot/themes/mpxe/select_e.png
new file mode 100644
index 0000000000000000000000000000000000000000..933236866775281581f1db04f10d6794be0dc4ae
Binary files /dev/null and b/netboot/themes/mpxe/select_e.png differ
diff --git a/netboot/themes/mpxe/select_w.png b/netboot/themes/mpxe/select_w.png
new file mode 100644
index 0000000000000000000000000000000000000000..28f6424ebf3c1b1595b3df815b7989a0eb9946d0
Binary files /dev/null and b/netboot/themes/mpxe/select_w.png differ
diff --git a/netboot/themes/mpxe/terminal_box_c.png b/netboot/themes/mpxe/terminal_box_c.png
new file mode 100644
index 0000000000000000000000000000000000000000..d0dd52a272ed14e1d658e384990b6eb48eff867b
Binary files /dev/null and b/netboot/themes/mpxe/terminal_box_c.png differ
diff --git a/netboot/themes/mpxe/terminal_box_e.png b/netboot/themes/mpxe/terminal_box_e.png
new file mode 100644
index 0000000000000000000000000000000000000000..394cbe4f5294002cdebf63ea25b37a7837e342e4
Binary files /dev/null and b/netboot/themes/mpxe/terminal_box_e.png differ
diff --git a/netboot/themes/mpxe/terminal_box_n.png b/netboot/themes/mpxe/terminal_box_n.png
new file mode 100644
index 0000000000000000000000000000000000000000..476f8bc6208c70ec6cc4d70a414c98055fee7c86
Binary files /dev/null and b/netboot/themes/mpxe/terminal_box_n.png differ
diff --git a/netboot/themes/mpxe/terminal_box_ne.png b/netboot/themes/mpxe/terminal_box_ne.png
new file mode 100644
index 0000000000000000000000000000000000000000..9e26959bbba3b01838af0d3f2573caa33f967de5
Binary files /dev/null and b/netboot/themes/mpxe/terminal_box_ne.png differ
diff --git a/netboot/themes/mpxe/terminal_box_nw.png b/netboot/themes/mpxe/terminal_box_nw.png
new file mode 100644
index 0000000000000000000000000000000000000000..5c3cba87cd5c602cc5d5201384067985adc6d5fd
Binary files /dev/null and b/netboot/themes/mpxe/terminal_box_nw.png differ
diff --git a/netboot/themes/mpxe/terminal_box_s.png b/netboot/themes/mpxe/terminal_box_s.png
new file mode 100644
index 0000000000000000000000000000000000000000..85a8901dc36bd3b201fa9ed53cc8bfa213838e89
Binary files /dev/null and b/netboot/themes/mpxe/terminal_box_s.png differ
diff --git a/netboot/themes/mpxe/terminal_box_se.png b/netboot/themes/mpxe/terminal_box_se.png
new file mode 100644
index 0000000000000000000000000000000000000000..d8627ee54c6bc46eb3ce040874c497f400fedb61
Binary files /dev/null and b/netboot/themes/mpxe/terminal_box_se.png differ
diff --git a/netboot/themes/mpxe/terminal_box_sw.png b/netboot/themes/mpxe/terminal_box_sw.png
new file mode 100644
index 0000000000000000000000000000000000000000..67c600c82301cfa647aed1e727f3e0f71a529fb7
Binary files /dev/null and b/netboot/themes/mpxe/terminal_box_sw.png differ
diff --git a/netboot/themes/mpxe/terminal_box_w.png b/netboot/themes/mpxe/terminal_box_w.png
new file mode 100644
index 0000000000000000000000000000000000000000..d066e2db8aa14e6845156c7c40e7f625569891f5
Binary files /dev/null and b/netboot/themes/mpxe/terminal_box_w.png differ
diff --git a/netboot/themes/mpxe/terminus-12.pf2 b/netboot/themes/mpxe/terminus-12.pf2
new file mode 100644
index 0000000000000000000000000000000000000000..60920353f77e74692a3973fed3561ca760ad15ef
Binary files /dev/null and b/netboot/themes/mpxe/terminus-12.pf2 differ
diff --git a/netboot/themes/mpxe/terminus-14.pf2 b/netboot/themes/mpxe/terminus-14.pf2
new file mode 100644
index 0000000000000000000000000000000000000000..8ab8bd1004e160aa04e2d676a0234e4ed0769d45
Binary files /dev/null and b/netboot/themes/mpxe/terminus-14.pf2 differ
diff --git a/netboot/themes/mpxe/terminus-16.pf2 b/netboot/themes/mpxe/terminus-16.pf2
new file mode 100644
index 0000000000000000000000000000000000000000..6e6b25d3610e3aa50d53294291dc1924179c1733
Binary files /dev/null and b/netboot/themes/mpxe/terminus-16.pf2 differ
diff --git a/netboot/themes/mpxe/terminus-18.pf2 b/netboot/themes/mpxe/terminus-18.pf2
new file mode 100644
index 0000000000000000000000000000000000000000..129cef14da25989557b8ee1108f31df0d77cd1a5
Binary files /dev/null and b/netboot/themes/mpxe/terminus-18.pf2 differ
diff --git a/netboot/themes/mpxe/theme.txt b/netboot/themes/mpxe/theme.txt
new file mode 100644
index 0000000000000000000000000000000000000000..020e2933c19bd323e4de0af324b5128eb8491ed8
--- /dev/null
+++ b/netboot/themes/mpxe/theme.txt
@@ -0,0 +1,65 @@
+# GRUB2 gfxmenu Linux theme
+# Designed for any resolution
+
+# Global Property
+title-text: ""
+desktop-image: "background.png"
+desktop-color: "#000000"
+terminal-font: "Terminus Regular 14"
+terminal-box: "terminal_box_*.png"
+terminal-left: "0"
+terminal-top: "0"
+terminal-width: "100%"
+terminal-height: "100%"
+terminal-border: "0"
+
+# Show the boot menu
++ boot_menu {
+  left = 32%
+  top = 20%
+  width = 50%
+  height = 50%
+  item_font = "Unifont Regular 16"
+  item_color = "#cccccc"
+  selected_item_color = "#ffffff"
+  icon_width = 32
+  icon_height = 32
+  item_icon_space = 20
+  item_height = 36
+  item_padding = 5
+  item_spacing = 10
+  selected_item_pixmap_style = "select_*.png"
+}
+
++ label {
+  top = 85%
+  left = 0%
+  width = 100%
+  align = "center"
+  text = "Misstar-PXE (觅星·云刻) By onion@misstar.com | Theme By Vimix"
+  color = "#cccccc"
+  font = "Unifont Regular 16"
+}
+
++ label {
+  top = 87%
+  left = 0%
+  width = 100%
+  align = "center"
+  text = "https://gitee.com/misstar/mpxe"
+  color = "#cccccc"
+  font = "Unifont Regular 16"
+}
+
+# Show a countdown message using the label component
++ label {
+  top = 90%
+  left = 0%
+  width = 100%
+  align = "center"
+  id = "__timeout__"
+  text = "Booting in %d seconds"
+  color = "#cccccc"
+  font = "Unifont Regular 16"
+}
+desktop-image: "background.png"
\ No newline at end of file
diff --git a/netboot/themes/mpxe/unicode.pf2 b/netboot/themes/mpxe/unicode.pf2
new file mode 100644
index 0000000000000000000000000000000000000000..78bd4a609f3f31f87fe6ae2f45c21d9042216e92
Binary files /dev/null and b/netboot/themes/mpxe/unicode.pf2 differ
diff --git a/netboot/web/about.html b/netboot/web/about.html
index eb7f8067155ad029eee4d5c280334af6bd0ea6a3..c952c50d78c7c6d11085479b1dc6be2024699847 100755
--- a/netboot/web/about.html
+++ b/netboot/web/about.html
@@ -26,13 +26,24 @@
         <ul class="layui-timeline">
           <li class="layui-timeline-item"> <i class="layui-icon layui-timeline-axis"></i>
           <div class="layui-timeline-content layui-text">
-           <h3 class="layui-timeline-title">2026年3月31日</h3>
+           <h3 class="layui-timeline-title">2026年6月19日</h3>
+           <p> 功能重构：从iPXE迁移到GRUB2，重构DHCP服务架构</p>
+           <p> 新增功能：DHCP租约持久化、IP分配ARP+ping双重检测</p>
+           <p> 功能更新：分离DHCP租约与安装状态，统一文件锁与原子写</p>
+           <p> 功能更新：安装进度上报自动刷新租约过期时间</p>
+           <p> Bug修复：修复GRUB默认项/超时不生效、中科grub.cfg识别异常等问题</p>
+          </div> </li>
+          <li class="layui-timeline-item"> <i class="layui-icon layui-timeline-axis"></i>
+          <div class="layui-timeline-content layui-text">
+           <h3 class="layui-timeline-title">2026年4月5日</h3>
            <p> 新增功能：日志查看</p>
+           <p> 新增功能：DHCP黑白名单</p>
           </div> </li>
           <li class="layui-timeline-item"> <i class="layui-icon layui-timeline-axis"></i>
           <div class="layui-timeline-content layui-text">
            <h3 class="layui-timeline-title">2026年3月20日</h3>
            <p> 新增功能：安装过程监控</p>
+           <p> Bug修复：修复配置为空问题</p>
           </div> </li>
           <li class="layui-timeline-item"> <i class="layui-icon layui-timeline-axis"></i>
           <div class="layui-timeline-content layui-text">
diff --git a/netboot/web/static/images/1.png b/netboot/web/static/images/1.png
index ef1562a295993d033ed13d70f27600ac2030d4f2..fa347a8bb81e4a27d616263a13b254e00f89addd 100644
Binary files a/netboot/web/static/images/1.png and b/netboot/web/static/images/1.png differ
diff --git a/netboot/web/static/images/2.png b/netboot/web/static/images/2.png
index 4301e371e2efbd65e24fa7894644d7472c0752bf..defd93fbdcc645adaaaea66f18248f6345540fbb 100644
Binary files a/netboot/web/static/images/2.png and b/netboot/web/static/images/2.png differ
diff --git a/netboot/web/static/images/3.png b/netboot/web/static/images/3.png
index 29961c4163eb9cad9def2e9843268b2c611725bd..85fe35c62bf6f9c9694c70f17b669327762b9498 100644
Binary files a/netboot/web/static/images/3.png and b/netboot/web/static/images/3.png differ
diff --git a/netboot/web/static/images/4.png b/netboot/web/static/images/4.png
index 1ef41f19222ef1ea8b5d48089560b145996c7fec..74460f17364ce42d32192f973ddfc1706d0c27b1 100755
Binary files a/netboot/web/static/images/4.png and b/netboot/web/static/images/4.png differ
diff --git a/netboot/web/static/images/5.png b/netboot/web/static/images/5.png
new file mode 100755
index 0000000000000000000000000000000000000000..4e1d50186289b4836338f693363945ec90acbcc9
Binary files /dev/null and b/netboot/web/static/images/5.png differ
diff --git a/netboot/web/static/images/6.png b/netboot/web/static/images/6.png
new file mode 100755
index 0000000000000000000000000000000000000000..ef875621d6e268c8b76524770d9db1a88e7d3098
Binary files /dev/null and b/netboot/web/static/images/6.png differ
diff --git a/netboot/web/static/images/7.png b/netboot/web/static/images/7.png
new file mode 100755
index 0000000000000000000000000000000000000000..3faec436cc0a67e9e1db613973596e6c3d1c1000
Binary files /dev/null and b/netboot/web/static/images/7.png differ
diff --git a/run.py b/run.py
index 82e456ef83498fa8586b2870199e40bf755a50d3..845a15ba46687cc91a04a2fcd933b191a0bb98c2 100755
--- a/run.py
+++ b/run.py
@@ -47,6 +47,8 @@ SETTINGS = {'NETBOOT_DIR':'netboot',
             'HTTP_PORT':80,
             'TFTP_PORT':69,
             'DHCP_MODE_PROXY':False,
+            'DHCP_LEASE_DURATION':7200,
+            'LEASES_FILE':'config/leases.json',
             'LOG_LEVEL':'',
             'MODE_VERBOSE':''}
 
@@ -251,20 +253,22 @@ class EnhancedMonitor(MultiServiceMonitor):
             broadcast = args.DHCP_BROADCAST,
             file_server = args.DHCP_FILESERVER,
             file_name = args.NETBOOT_FILE,
-            use_ipxe = args.USE_IPXE,
             use_http = args.USE_HTTP,
             mode_proxy = args.DHCP_MODE_PROXY,
             log_level = args.LOG_LEVEL,
             whitelist = args.DHCP_WHITELIST,
             blacklist = args.DHCP_BLACKLIST,
             logger = dhcp_logger,
-            saveleases = args.LEASES_FILE)
+            saveleases = args.LEASES_FILE,
+            lease_duration = args.DHCP_LEASE_DURATION)
         # 重新创建 HTTP 服务实例以应用新配置
         httpserver=http.HTTPServer("0.0.0.0",args.HTTP_PORT,log_level = args.LOG_LEVEL,logger = http_logger)
         # 更新 service_pool 中的 target 引用
         self.service_pool["TFTP-Server"].target = tftp_server.listen
         self.service_pool["DHCP-Server"].target = dhcp_server.listen
         self.service_pool["HTTP-Server"].target = httpserver.start
+        # 重新生成启动菜单和挂载点
+        subprocess.check_output(['bash', 'scripts/gen_boot_menu.sh'], text=True)
 
     def restart_all_services(self):
         """无验证的全局重启操作"""
@@ -409,7 +413,7 @@ if __name__ == "__main__":
         print("检查NFS服务状态时出错:", e)
         sys.exit(1)
     print("正在扫描iso目录")
-    output = subprocess.check_output(['bash', 'scripts/gen_boot_ipxe.sh'], text=True)
+    output = subprocess.check_output(['bash', 'scripts/gen_boot_menu.sh'], text=True)
     args=loadconf()
     sys_logger = logging.getLogger('M-PXE')
     log_file = "logs/pxe.log"
@@ -465,14 +469,14 @@ if __name__ == "__main__":
             broadcast = args.DHCP_BROADCAST,
             file_server = args.DHCP_FILESERVER,
             file_name = args.NETBOOT_FILE,
-            use_ipxe = args.USE_IPXE,
             use_http = args.USE_HTTP,
             mode_proxy = args.DHCP_MODE_PROXY,
             log_level = args.LOG_LEVEL,
             whitelist = args.DHCP_WHITELIST,
             blacklist = args.DHCP_BLACKLIST,
             logger = dhcp_logger,
-            saveleases = args.LEASES_FILE)
+            saveleases = args.LEASES_FILE,
+            lease_duration = args.DHCP_LEASE_DURATION)
     monitor.add_service(ServiceProfile(
         name="DHCP-Server",
         target=dhcp_server.listen,
diff --git a/scripts/gen_boot_ipxe.sh b/scripts/gen_boot_menu.sh
similarity index 54%
rename from scripts/gen_boot_ipxe.sh
rename to scripts/gen_boot_menu.sh
index 662ed9cfd1621eb0f430552598e9872d8a8247db..8f93c652ae500006ef4b0e06d322e0875ff647d2 100755
--- a/scripts/gen_boot_ipxe.sh
+++ b/scripts/gen_boot_menu.sh
@@ -1,10 +1,7 @@
 #!/bin/bash
-. scripts/umount.sh
-. scripts/gen_ipxe.sh $1
-BOOTPXE=netboot/boot.ipxe
+. scripts/gen_cfg.sh $1
 ConfigDir=netboot/config
 MonitorDir=netboot/monitor
-cp -rf config/header.ipxe $BOOTPXE
 rm -rf .temp.ipxe
 
 if [ ! -f "config/config.json" ];then
@@ -128,93 +125,155 @@ cat netboot/monitor/hooks.sh.tpl > netboot/monitor/hooks/prepare.sh
 sed -i "s#SERVER_IP_ADDRESS#$ip#g"  netboot/monitor/hooks/prepare.sh
 sed -i "s#HTTP_PORT#$HTTP_PORT#g"   netboot/monitor/hooks/prepare.sh
 
-ls -rt $ConfigDir | while read ipxename; do
+ls -rt $ConfigDir | while read isoid; do
     NfsRootPoint=/tmp/pxenfsroot
     autoinstall=""
     fsid=1025
-    isoname=$(ReadIni $ConfigDir/$ipxename/config.ini config isoname)
+    isoname=$(ReadIni $ConfigDir/$isoid/config.ini config isoname)
     if [ ! -f "iso/""$isoname" ]; then
-        rm -rf $ConfigDir/$ipxename
+        rm -rf $ConfigDir/$isoid
         continue
     fi
-    if [ -f $ConfigDir/$ipxename"/extfile.ini" ]; then
-      extpathname=$(ReadIni $ConfigDir/$ipxename/config.ini config extpathname)
-      mkdir -p $NfsRootPoint/$ipxename/$extpathname
+    if [ -f $ConfigDir/$isoid"/extfile.ini" ]; then
+      extpathname=$(ReadIni $ConfigDir/$isoid/config.ini config extpathname)
+      mkdir -p $NfsRootPoint/$isoid/$extpathname
       while IFS= read -r line || [[ -n "${line}" ]]; do
         if [ "$line""mpxe" != "mpxe" ];then
           if [ -d $line ]; then
-            mkdir -p $NfsRootPoint/$ipxename/$extpathname/$(basename $line)
-            echo "$NfsRootPoint/$ipxename/$extpathname/$(basename $line) *(ro,no_subtree_check,crossmnt,insecure,fsid=$fsid,no_root_squash,all_squash,anongid=0,anonuid=0,insecure)  ###MisstarPXE" >> /etc/exports
+            mkdir -p $NfsRootPoint/$isoid/$extpathname/$(basename $line)
+            echo "$NfsRootPoint/$isoid/$extpathname/$(basename $line) *(ro,no_subtree_check,crossmnt,insecure,fsid=$fsid,no_root_squash,all_squash,anongid=0,anonuid=0,insecure)  ###MisstarPXE" >> /etc/exports
             fsid=`expr $fsid + 1`
           elif [ -f $line ]; then
-            touch $NfsRootPoint/$ipxename/$extpathname/$(basename $line)
+            touch $NfsRootPoint/$isoid/$extpathname/$(basename $line)
           fi
-          mount --bind $line $NfsRootPoint/$ipxename/$extpathname/$(basename $line)
+          mount --bind $line $NfsRootPoint/$isoid/$extpathname/$(basename $line)
         fi
-      done < $ConfigDir/$ipxename"/extfile.ini"
+      done < $ConfigDir/$isoid"/extfile.ini"
       exportfs -r
     fi
 
-    cp $ConfigDir/$ipxename/grub.cfg_tpl $ConfigDir/$ipxename/grub.cfg
+    cp $ConfigDir/$isoid/grub.cfg_tpl $ConfigDir/$isoid/grub.cfg
 
     #Kylin_desktop
-    mkdir -p $NfsRootPoint/$ipxename/hooks/prepare
-    cp -f netboot/monitor/hooks/prepare.sh $NfsRootPoint/$ipxename/hooks/prepare/mpxe_monitor.sh
-    chmod +x $NfsRootPoint/$ipxename/hooks/prepare/mpxe_monitor.sh
+    mkdir -p $NfsRootPoint/$isoid/hooks/prepare
+    cp -f netboot/monitor/hooks/prepare.sh $NfsRootPoint/$isoid/hooks/prepare/mpxe_monitor.sh
+    chmod +x $NfsRootPoint/$isoid/hooks/prepare/mpxe_monitor.sh
 
     #uos-desktop
-    if [[ -d "$NfsRootPoint/$ipxename/oem" ]];then
-      umount $NfsRootPoint/$ipxename/oem
-      rm -r $NfsRootPoint/$ipxename/oem
-      mkdir -p $NfsRootPoint/$ipxename/oem/live_hooks
-      cp -f netboot/monitor/hooks/prepare.sh $NfsRootPoint/$ipxename/oem/live_hooks/mpxe_monitor.job
-      chmod +x $NfsRootPoint/$ipxename/oem/live_hooks/mpxe_monitor.job
+    if [[ -d "$NfsRootPoint/$isoid/oem" ]];then
+      umount $NfsRootPoint/$isoid/oem
+      rm -r $NfsRootPoint/$isoid/oem
+      mkdir -p $NfsRootPoint/$isoid/oem/live_hooks
+      cp -f netboot/monitor/hooks/prepare.sh $NfsRootPoint/$isoid/oem/live_hooks/mpxe_monitor.job
+      chmod +x $NfsRootPoint/$isoid/oem/live_hooks/mpxe_monitor.job
     fi
 
-    isautoinstall=$(ReadIni $ConfigDir/$ipxename/config.ini config autoinstall )
+    isautoinstall=$(ReadIni $ConfigDir/$isoid/config.ini config autoinstall )
     if [ "$isautoinstall" = "true" ];then
-        cp -f $ConfigDir/$ipxename/autoinstall.cfg_tpl $ConfigDir/$ipxename/autoinstall.cfg
-        installclass=$(ReadIni $ConfigDir/$ipxename/config.ini config class )
+        cp -f $ConfigDir/$isoid/autoinstall.cfg_tpl $ConfigDir/$isoid/autoinstall.cfg
+        installclass=$(ReadIni $ConfigDir/$isoid/config.ini config class )
         if [ "$installclass" = "Kickstart" ];then
           #在现有的ks文件%pre中加入监控脚本内容
-          PRE_EXISTS=$(grep -v '^[[:space:]]*#' $ConfigDir/$ipxename/autoinstall.cfg | grep -q '^[[:space:]]*%pre' && echo "yes" || echo "no")
+          PRE_EXISTS=$(grep -v '^[[:space:]]*#' $ConfigDir/$isoid/autoinstall.cfg | grep -q '^[[:space:]]*%pre' && echo "yes" || echo "no")
           if [ "$PRE_EXISTS" = "yes" ]; then
-              PRE_START_LINE=$(grep -n -v '^[[:space:]]*#' $ConfigDir/$ipxename/autoinstall.cfg | grep '%pre' | head -1 | cut -d: -f1)
-              END_LINE=$(sed -n "${PRE_START_LINE},\$p" $ConfigDir/$ipxename/autoinstall.cfg | grep -n '%end' | head -1 | cut -d: -f1)
+              PRE_START_LINE=$(grep -n -v '^[[:space:]]*#' $ConfigDir/$isoid/autoinstall.cfg | grep '%pre' | head -1 | cut -d: -f1)
+              END_LINE=$(sed -n "${PRE_START_LINE},\$p" $ConfigDir/$isoid/autoinstall.cfg | grep -n '%end' | head -1 | cut -d: -f1)
               ABS_END_LINE=$((PRE_START_LINE + END_LINE - 1))
               INSERT_CONTENT_ESC=$(cat netboot/monitor/hooks.sh.tpl | sed ':a;N;$!ba;s/\n/\\n/g')
-              sed -i "${ABS_END_LINE}i\\${INSERT_CONTENT_ESC}" $ConfigDir/$ipxename/autoinstall.cfg
+              sed -i "${ABS_END_LINE}i\\${INSERT_CONTENT_ESC}" $ConfigDir/$isoid/autoinstall.cfg
           else
-              echo -e "\n\n%pre --log=/tmp/pre_download.log" >> $ConfigDir/$ipxename/autoinstall.cfg
-              cat netboot/monitor/hooks.sh.tpl >> $ConfigDir/$ipxename/autoinstall.cfg
-              echo "%end"  >> $ConfigDir/$ipxename/autoinstall.cfg
+              echo -e "\n\n%pre --log=/tmp/pre_download.log" >> $ConfigDir/$isoid/autoinstall.cfg
+              cat netboot/monitor/hooks.sh.tpl >> $ConfigDir/$isoid/autoinstall.cfg
+              echo "%end"  >> $ConfigDir/$isoid/autoinstall.cfg
           fi
         fi
         autoinstall=" [autoinstall]"
     fi
     
-    echo "  item a"$ipxename" "$isoname$autoinstall >> $BOOTPXE
-    echo ":a"$ipxename >> .temp.ipxe
-    echo "chain http://SERVER_IP_ADDRESS:HTTP_PORT/config/$ipxename/grub.efi" >> .temp.ipxe
-    echo "  boot || goto retry" >>  .temp.ipxe
-    echo "  goto start" >>  .temp.ipxe
-    echo " " >>  .temp.ipxe
 done
 
-
-
-
-cat config/foot.ipxe >> $BOOTPXE
-echo " "  >> $BOOTPXE
-cat .temp.ipxe >> $BOOTPXE
-sed -i "s#SERVER_IP_ADDRESS#$ip#g"  $BOOTPXE
-sed -i "s#HTTP_PORT#$HTTP_PORT#g"  $BOOTPXE
+# 替换配置文件和监控脚本中的变量
 sed -i "s#SERVER_IP_ADDRESS#$ip#g"  $ConfigDir/*/*.cfg
 sed -i "s#SERVER_IP_ADDRESS#$ip#g"  $MonitorDir/*.sh $MonitorDir/*/*.sh $MonitorDir/*.cfg
 sed -i "s#HTTP_PORT#$HTTP_PORT#g"   $ConfigDir/*/*.cfg
 sed -i "s#HTTP_PORT#$HTTP_PORT#g"   $MonitorDir/*.sh $MonitorDir/*/*.sh $MonitorDir/*.cfg
 
-sed -i "s#MENU_DEFAULT#a$MENU_DEFAULT#g"  $BOOTPXE
-sed -i "s#MENU_TIMEOUT#$MENU_TIMEOUT""000#g"  $BOOTPXE
+rm -rf .temp.ipxe
+
+# ====== 新增：生成 GRUB 聚合菜单 ======
+echo "=== 开始生成 GRUB 菜单 ==="
+# 输出文件
+BOOT_GRUB=netboot/grub.cfg
+
+# 复制 GRUB header 模板
+cp config/header_grub.cfg $BOOT_GRUB
+
+# 替换 header 中的变量（MENU_DEFAULT 暂不替换，等遍历完菜单项确定序号后再替换）
+sed -i "s#SERVER_IP_ADDRESS#$ip#g" $BOOT_GRUB
+sed -i "s#HTTP_PORT#$HTTP_PORT#g" $BOOT_GRUB
+sed -i "s#MENU_TIMEOUT#$((MENU_TIMEOUT))#g" $BOOT_GRUB
+
+# 添加分隔线和标题
+echo "" >> $BOOT_GRUB
+echo "# ====== 操作系统菜单 ======" >> $BOOT_GRUB
+
+# 遍历所有配置目录，生成 GRUB 菜单项，同时记录 MENU_DEFAULT 对应的序号
+menu_index=0
+ls -rt $ConfigDir | while read isoid; do
+    # 读取 ISO 配置
+    isoname=$(ReadIni $ConfigDir/$isoid/config.ini config isoname 2>/dev/null || echo "")
+    
+    # 检查 ISO 是否存在
+    if [ ! -f "iso/$isoname" ]; then
+        continue
+    fi
+    
+    # 检查是否匹配 MENU_DEFAULT，记录当前序号
+    if [ "$isoid" = "$MENU_DEFAULT" ]; then
+        sed -i "s#MENU_DEFAULT#$menu_index#g" $BOOT_GRUB
+    fi
+    
+    # 检查自动安装标记
+    autoinstall=""
+    isautoinstall=$(ReadIni $ConfigDir/$isoid/config.ini config autoinstall 2>/dev/null || echo "false")
+    if [ "$isautoinstall" = "true" ]; then
+        autoinstall=" [autoinstall]"
+    fi
+    
+    # 根据 ISO 名称自动识别系统类型，设置 --class 图标
+    isoname_lower=$(echo "$isoname" | tr '[:upper:]' '[:lower:]')
+    class=""
+    if echo "$isoname_lower" | grep -q "kylin"; then
+        class="kylin"
+    elif echo "$isoname_lower" | grep -q "uos\|deepin"; then
+        class="uos"
+    elif echo "$isoname_lower" | grep -q "centos\|rhel\|fedora"; then
+        class="fedora"
+    elif echo "$isoname_lower" | grep -q "ubuntu"; then
+        class="ubuntu"
+    elif echo "$isoname_lower" | grep -q "debian"; then
+        class="debian"
+    elif echo "$isoname_lower" | grep -q "anolis"; then
+        class="anolis"
+    elif echo "$isoname_lower" | grep -q "ctyunos"; then
+        class="ctyunos"
+    elif echo "$isoname_lower" | grep -q "linux"; then
+        class="linux"
+    else
+        class="unknown"
+    fi
+    
+    # 生成 GRUB menuentry（带 --class 图标）
+    echo "menuentry '$isoname$autoinstall' --class $class --id $isoid {" >> $BOOT_GRUB
+    echo "    configfile (\$root)/config/$isoid/grub.cfg" >> $BOOT_GRUB
+    echo "}" >> $BOOT_GRUB
+    echo "" >> $BOOT_GRUB
+    
+    menu_index=$((menu_index + 1))
+done
+
+# 如果遍历完所有菜单项后 MENU_DEFAULT 仍未匹配到，则默认设为 0
+sed -i "s#MENU_DEFAULT#0#g" $BOOT_GRUB
 
-rm -rf .temp.ipxe
\ No newline at end of file
+# 添加 GRUB footer
+cat config/footer_grub.cfg >> $BOOT_GRUB
diff --git a/scripts/gen_ipxe.sh b/scripts/gen_cfg.sh
similarity index 83%
rename from scripts/gen_ipxe.sh
rename to scripts/gen_cfg.sh
index 500f5aab6c45b9d10355732cbfc8383f7380372b..64d62a46e6c37d9e2deeca0376591c303a79ca04 100755
--- a/scripts/gen_ipxe.sh
+++ b/scripts/gen_cfg.sh
@@ -1,8 +1,8 @@
 #!/bin/bash
+. scripts/umount.sh $1
 
 cd scripts
 PxeMountPoint=$(realpath ../netboot/pxenfsroot)
-GrubEfiDir=../netboot/grub_efi/
 ConfigDir=../netboot/config/
 
 
@@ -14,19 +14,18 @@ ls ../iso/*.iso | while read filename; do
   isoname=$(echo -n "$filename" | md5sum | cut -c1-9)
   mkdir -p $PxeMountPoint/$isoname $PxeMountPoint/$isoname"_iso"
   if [ "$1" != "--notremount" ] ;then
-      umount -q -l $PxeMountPoint/$isoname
       mount -o ro "$filename" $PxeMountPoint/$isoname"_iso"
-      ls -A $PxeMountPoint/$isoname"_iso"/ | while read filename ;
-      do
-        if [ -d $PxeMountPoint/$isoname"_iso"/$filename ]; then
-          mkdir -p $PxeMountPoint/$isoname/$filename
-        elif [ -f $PxeMountPoint/$isoname"_iso"/$filename ]; then
-          touch $PxeMountPoint/$isoname/$filename
-        fi
-        mount --bind $PxeMountPoint/$isoname"_iso"/$filename $PxeMountPoint/$isoname/$filename
-      done
   fi
-  grubfile=$(find $PxeMountPoint/$isoname -name "grub.cfg" | head -1)
+  ls -A $PxeMountPoint/$isoname"_iso"/ | while read filename ;
+  do
+    if [ -d $PxeMountPoint/$isoname"_iso"/$filename ]; then
+      mkdir -p $PxeMountPoint/$isoname/$filename
+    elif [ -f $PxeMountPoint/$isoname"_iso"/$filename ]; then
+      touch $PxeMountPoint/$isoname/$filename
+    fi
+    mount --bind $PxeMountPoint/$isoname"_iso"/$filename $PxeMountPoint/$isoname/$filename
+  done
+  grubfile=$(find $PxeMountPoint/$isoname/boot/ $PxeMountPoint/$isoname/ -name "grub.cfg"  2>/dev/null | head -1)
 
   #netboot 引导文件
 
@@ -47,7 +46,6 @@ ls ../iso/*.iso | while read filename; do
     continue
   fi
   mkdir -p $ConfigDir$isoname
-  cp -rpf $GrubEfiDir$PLATFORM.efi $ConfigDir$isoname/grub.efi
   cp -rpf $grubfile $ConfigDir$isoname/grub.cfg_tpl
 
   #kylin desktop
diff --git a/scripts/umount.sh b/scripts/umount.sh
index 4295c61c0f5bd2a852aa3fe00f05f2dfef0ca024..cb0e1888609b47612d38bf25c4a63a30a07920ed 100644
--- a/scripts/umount.sh
+++ b/scripts/umount.sh
@@ -1,5 +1,7 @@
 #!/bin/bash
 PxeMountPoint=$(realpath netboot/pxenfsroot)
-
-mount | grep $PxeMountPoint | awk '{print $3}' | xargs umount -l -q > /dev/null 2>&1
-rm -rf netboot/pxenfsroot/* > /dev/null 2>&1
\ No newline at end of file
+mount | grep $PxeMountPoint |grep -v _iso | awk '{print $3}' | xargs umount -l -q > /dev/null 2>&1
+if [ "$1" != "--notremount" ] ;then
+    mount | grep $PxeMountPoint | awk '{print $3}' | xargs umount -l -q > /dev/null 2>&1
+    rm -rf netboot/pxenfsroot/* > /dev/null 2>&1
+fi
\ No newline at end of file
diff --git a/services/dhcp.py b/services/dhcp.py
index 0e70403b8f738843ba501f813f7fe24a92aa77a2..9cb1d3f64e87b873b925eb7af7e46977d726a9ef 100755
--- a/services/dhcp.py
+++ b/services/dhcp.py
@@ -6,13 +6,20 @@ This file contains classes and functions that implement the DHCP service
 import socket
 import struct
 import json
+import fcntl
 from collections import defaultdict
 from time import time
 import time as time2
+import threading
+from concurrent.futures import ThreadPoolExecutor
+from services import helpers
 
 TYPE_53_DHCPDISCOVER = 1
 TYPE_53_DHCPREQUEST =  3
 
+# 只允许写入 leases.json 的 DHCP 字段，安装状态字段写入 install_status.json
+DHCP_LEASE_FIELDS = {'ip', 'expire', 'reserved', 'new'}
+
 class OutOfLeasesError(Exception):
     pass
 
@@ -59,7 +66,6 @@ class DHCPD:
             #self.file_name = 'pxelinux.0'
         else:
             self.force_file_name = True
-        self.ipxe = server_settings.get('use_ipxe', False)
         self.http = server_settings.get('use_http', False)
         self.mode_proxy = server_settings.get('mode_proxy', False) # ProxyDHCP mode
         self.static_config = server_settings.get('static_config', dict())
@@ -67,16 +73,11 @@ class DHCPD:
         self.blacklist = server_settings.get('blacklist', [])
         self.log_level = server_settings.get('log_level', False)
         self.logger = server_settings.get('logger', None)
-        self.save_leases_file = server_settings.get('saveleases', '')
+        # 持久化配置
+        self.save_leases_file = server_settings.get('saveleases', 'config/leases.json')
+        self.lease_duration = int(server_settings.get('lease_duration', 7200))
         self.magic = struct.pack('!I', 0x63825363) # magic cookie
 
-        if self.http and not self.ipxe:
-            self.logger.warning('HTTP selected but iPXE disabled. PXE ROM must support HTTP requests.')
-        if self.ipxe and self.http:
-            self.file_name = 'http://{0}/{1}'.format(self.file_server, self.file_name)
-        if self.ipxe and not self.http:
-            self.file_name = 'tftp://{0}/{1}'.format(self.file_server, self.file_name)
-
         self.logger.debug('NOTICE: DHCP server started in debug mode. DHCP server is using the following:')
         self.logger.info('DHCP Server IP: {0}'.format(self.ip))
         self.logger.info('DHCP Server Port: {0}'.format(self.port))
@@ -84,6 +85,7 @@ class DHCPD:
         # debug info for ProxyDHCP mode
         if not self.mode_proxy:
             self.logger.info('Lease Range: {0} - {1}'.format(self.offer_from, self.offer_to))
+            self.logger.info('Lease Duration: {0} seconds ({1} hours)'.format(self.lease_duration, self.lease_duration / 3600))
             self.logger.info('Subnet Mask: {0}'.format(self.subnet_mask))
             self.logger.info('Router: {0}'.format(self.router))
             self.logger.info('DNS Server: {0}'.format(self.dns_server))
@@ -96,7 +98,6 @@ class DHCPD:
         self.logger.info('File Server IP: {0}'.format(self.file_server))
         self.logger.info('File Name: {0}'.format(self.file_name))
         self.logger.info('ProxyDHCP Mode: {0}'.format(self.mode_proxy))
-        self.logger.info('Using iPXE: {0}'.format(self.ipxe))
         self.logger.info('Using HTTP Server: {0}'.format(self.http))
         self.logger.info('Bind Nic: {0}'.format(self.nic))
 
@@ -106,36 +107,256 @@ class DHCPD:
         self.sock.setsockopt(socket.SOL_SOCKET, socket.SO_BINDTODEVICE, self.nic.encode())
         self.sock.bind(('', self.port ))
 
+        # 线程池，用于并发处理DHCP请求，避免单个请求阻塞主循环
+        self._executor = ThreadPoolExecutor(max_workers=10)
+
         # key is MAC
         # separate options dict so we don't have to clean up on export
         self.options = dict()
-        self.leases = defaultdict(lambda: {'ip': '', 'expire': 0, 'ipxe': self.ipxe})
-        with open('config/leases.json', 'w') as file:
-            json.dump({}, file, indent=4)
+        self.leases = defaultdict(lambda: {'ip': '', 'expire': 0})
+        self._load_leases()
+        self._cleanup_expired_leases()
+        self._leases_lock = threading.Lock()
+        self._start_lease_save_timer()
+
+    def _load_leases(self):
+        """从文件加载租约数据"""
         if self.save_leases_file:
             try:
-                leases_file = open(self.save_leases_file, 'rb')
+                leases_file = open(self.save_leases_file, 'r')
                 imported = json.load(leases_file)
+                leases_file.close()
                 import_safe = dict()
                 for lease in imported:
-                    packed_mac = struct.pack('BBBBBB', *map(lambda x:int(x, 16), lease.split(':')))
+                    normalized_mac = lease.replace(':', '').lower()
+                    packed_mac = struct.pack('BBBBBB', *map(lambda x:int(x, 16), [normalized_mac[i:i+2] for i in range(0, 12, 2)]))
                     import_safe[packed_mac] = imported[lease]
-                self.leases.update(import_safe)
-                self.logger.info('Loaded leases from {0}'.format(self.save_leases_file))
-            except IOError:
-                pass
-            except ValueError:
+                # 只保留 DHCP 字段，安装状态由 install_status.json 维护
+                for packed_mac, lease in import_safe.items():
+                    self.leases[packed_mac] = {k: v for k, v in lease.items() if k in DHCP_LEASE_FIELDS}
+                self.logger.info('Loaded {0} leases from {1}'.format(len(imported), self.save_leases_file))
+            except IOError as e:
+                self.logger.warning('Could not load leases file: {0}'.format(e))
+            except ValueError as e:
+                self.logger.warning('Invalid leases file format: {0}'.format(e))
+
+    def _deep_merge(self, target, source):
+        """深度合并字典，保留目标中已有但源中没有的字段"""
+        for key, value in source.items():
+            if key in target and isinstance(target[key], dict) and isinstance(value, dict):
+                self._deep_merge(target[key], value)
+            else:
+                target[key] = value
+        return target
+
+    def _save_leases(self):
+        """保存租约数据到文件（使用非阻塞锁，避免线程死锁）"""
+        self.logger.debug('_save_leases called, save_leases_file={0}'.format(self.save_leases_file))
+        if not self.save_leases_file:
+            return
+        try:
+            with helpers.json_lock(blocking=False) as acquired:
+                if not acquired:
+                    self.logger.debug('_save_leases: lock busy, skipping')
+                    return
+                try:
+                    with open(self.save_leases_file, 'r') as f:
+                        existing_data = json.load(f)
+                except (IOError, json.JSONDecodeError):
+                    existing_data = {}
+
+                current_time = time()
+                expired_macs = []
+                
+                # 只保存有实际IP分配的租约，并过滤出纯 DHCP 字段
+                leases_to_save = {}
+                for mac_bytes, lease_data in self.leases.items():
+                    mac_str = mac_bytes.hex() if isinstance(mac_bytes, bytes) else mac_bytes
+                    if lease_data.get('ip'):
+                        leases_to_save[mac_str] = {k: v for k, v in lease_data.items() if k in DHCP_LEASE_FIELDS}
+                
+                for key, value in leases_to_save.items():
+                    existing_data[key] = value
+                    expire_time = value.get('expire', 0)
+                    if expire_time > 0 and expire_time <= current_time:
+                        expired_macs.append(key)
+                
+                for mac in expired_macs:
+                    if mac in existing_data:
+                        del existing_data[mac]
+                
+                for mac in list(existing_data.keys()):
+                    expire_time = existing_data[mac].get('expire', 0)
+                    if expire_time > 0 and expire_time <= current_time:
+                        del existing_data[mac]
+                        expired_macs.append(mac)
+                
+                with self._leases_lock:
+                    helpers.atomic_write_json(self.save_leases_file, existing_data)
+                
+                if expired_macs:
+                    self.logger.debug('Cleaned up {0} expired leases during save'.format(len(set(expired_macs))))
+                self.logger.debug('Saved {0} leases to {1}'.format(len(existing_data), self.save_leases_file))
+        except Exception as e:
+            self.logger.error('Failed to save leases: {0}'.format(e))
+
+    def _start_lease_save_timer(self):
+        """启动定时保存租约的线程"""
+        def save_periodically():
+            while True:
+                time2.sleep(300)
+                self._save_leases()
+        timer_thread = threading.Thread(target=save_periodically, daemon=True)
+        timer_thread.start()
+
+    def _cleanup_expired_leases(self):
+        """清理过期租约和不在地址池范围内的租约"""
+        current_time = time()
+        
+        # 计算地址池范围
+        encode = lambda x: struct.unpack('!I', socket.inet_aton(x))[0]
+        from_host = encode(self.offer_from)
+        to_host = encode(self.offer_to)
+        
+        expired_or_out_of_range_macs = []
+        for mac, lease in self.leases.items():
+            if lease.get('expire', 0) > 0 and lease['expire'] <= current_time:
+                expired_or_out_of_range_macs.append(mac)
+                continue
+            
+            ip = lease.get('ip', '')
+            if ip:
+                try:
+                    ip_int = encode(ip)
+                    if ip_int < from_host or ip_int > to_host:
+                        expired_or_out_of_range_macs.append(mac)
+                        self.logger.info('Lease for MAC: {0} (IP: {1}) is out of current pool range, removing'.format(
+                            self.get_mac(mac), ip))
+                except Exception:
+                    expired_or_out_of_range_macs.append(mac)
+        
+        for mac in expired_or_out_of_range_macs:
+            del self.leases[mac]
+        
+        if expired_or_out_of_range_macs:
+            self.logger.info('Cleaned up {0} leases (expired or out of pool range)'.format(len(expired_or_out_of_range_macs)))
+
+    def check_ip_in_use(self, ip, retries=2, delay=1):
+        """
+        检测IP地址是否已被网络占用
+        快速检测：先查ARP缓存，再快速ping确认
+        如果IP被检测为在用，会记录到leases中避免后续重复检测
+        """
+        self.logger.info('Checking if IP {0} is in use (retries={1})'.format(ip, retries))
+        
+        import subprocess
+        
+        # 第一步：先检查ARP缓存（最快，不产生网络流量）
+        try:
+            arp_result = subprocess.run(['ip', 'neigh', 'show', ip],
+                                       capture_output=True, text=True, timeout=2)
+            output = arp_result.stdout.strip()
+            if output and ('REACHABLE' in output or 'PERMANENT' in output):
+                self.logger.info('IP {0} is in use (REACHABLE from ARP cache)'.format(ip))
+                parts = output.split()
+                for i, part in enumerate(parts):
+                    if part == 'lladdr' and i + 1 < len(parts):
+                        self._record_ip_lease(ip, parts[i + 1])
+                        break
+                return True
+        except Exception:
+            pass
+        
+        # 第二步：快速ping检测（只ping 1次，等待1秒）
+        for attempt in range(retries):
+            try:
+                result = subprocess.run(['ping', '-c', '1', '-W', '1', ip],
+                                        stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL, timeout=3)
+            except subprocess.TimeoutExpired:
+                result = None
+            
+            # 检查ARP缓存
+            try:
+                arp_result = subprocess.run(['ip', 'neigh', 'show', ip],
+                                           capture_output=True, text=True, timeout=2)
+                output = arp_result.stdout.strip()
+                self.logger.debug('ARP entry for IP {0} (attempt {1}): {2}'.format(ip, attempt + 1, output))
+                if output and ('REACHABLE' in output or 'PERMANENT' in output):
+                    self.logger.info('IP {0} is in use (REACHABLE)'.format(ip))
+                    parts = output.split()
+                    for i, part in enumerate(parts):
+                        if part == 'lladdr' and i + 1 < len(parts):
+                            self._record_ip_lease(ip, parts[i + 1])
+                            break
+                    return True
+            except Exception:
                 pass
+            
+            if attempt < retries - 1:
+                time2.sleep(delay)
+        
+        self.logger.info('IP {0} is not in use'.format(ip))
+        return False
+
+    def _record_ip_lease(self, ip, mac):
+        """
+        将检测到的IP和MAC记录到leases中，避免后续重复检测
+        """
+        try:
+            normalized_mac = mac.replace(':', '').lower()
+            packed_mac = struct.pack('BBBBBB', *map(lambda x:int(x, 16), [normalized_mac[i:i+2] for i in range(0, 12, 2)]))
+            
+            if packed_mac in self.leases:
+                self.leases[packed_mac]['ip'] = ip
+                self.leases[packed_mac]['expire'] = time() + self.lease_duration
+                self.leases[packed_mac]['reserved'] = True
+            else:
+                self.leases[packed_mac] = {
+                    'ip': ip,
+                    'expire': time() + self.lease_duration,
+                    'reserved': True
+                }
+            
+            self.logger.debug('Recorded reserved IP {0} for MAC {1}'.format(ip, normalized_mac))
+            # 异步保存租约，避免阻塞
+            self._executor.submit(self._save_leases)
+        except Exception as e:
+            self.logger.warning('Failed to record IP lease: {0}'.format(e))
+        
+
+    def get_arp_mac(self, ip):
+        """
+        获取IP对应的ARP MAC地址
+        """
+        import subprocess
+        
+        try:
+            subprocess.run(['ping', '-c', '1', '-W', '1', ip],
+                         stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL, timeout=2)
+            result = subprocess.run(['ip', 'neigh', 'show', ip],
+                                 capture_output=True, text=True, timeout=2)
+            output = result.stdout.strip()
+            if output and 'FAILED' not in output and 'INCOMPLETE' not in output:
+                parts = output.split()
+                for i, part in enumerate(parts):
+                    if part == 'lladdr' and i + 1 < len(parts):
+                        return parts[i + 1].upper()
+        except Exception:
+            pass
+        
+        return None
+
+    def check_ip_mac_match(self, ip, client_mac):
+        """
+        检查IP是否被指定MAC占用
+        返回: True(匹配), False(不匹配或未找到)
+        """
+        arp_mac = self.get_arp_mac(ip)
+        if arp_mac is None:
+            return False
+        lease_mac = client_mac.upper() if isinstance(client_mac, str) else self.get_mac(client_mac).upper()
+        return arp_mac == lease_mac
 
-    def export_leases(self):
-        if self.save_leases_file:
-            export_safe = dict()
-            for lease in self.leases:
-                # translate the key to json safe (and human readable) mac
-                export_safe[self.get_mac(lease)] = self.leases[lease]
-            leases_file = open(self.save_leases_file, 'w')
-            json.dump(export_safe, leases_file)
-            self.logger.info('Exported leases to {0}'.format(self.save_leases_file))
 
     def get_namespaced_static(self, path, fallback = {}):
         statics = self.static_config
@@ -150,6 +371,9 @@ class DHCPD:
         '''
 
         # if we use ints, we don't have to deal with octet overflow
+        # 分配IP前先清理过期租约，确保过期IP可以被重新分配
+        self._cleanup_expired_leases()
+
         # or nested loops (up to 3 with 10/8); convert both to 32-bit integers
 
         # e.g '192.168.1.1' to 3232235777
@@ -160,17 +384,39 @@ class DHCPD:
         from_host = encode(self.offer_from)
         to_host = encode(self.offer_to)
 
-        # pull out already leased IPs
+        # pull out already leased IPs (not expired)
+        current_time = time()
         leased = [self.leases[i]['ip'] for i in self.leases
-                if self.leases[i]['expire'] > time()]
+                if self.leases[i]['expire'] > current_time]
 
         # convert to 32-bit int
-        leased = map(encode, leased)
+        leased = set(map(encode, leased))
 
-        # loop through, make sure not already leased and not in form X.Y.Z.0
+        # 优化：先快速扫描ARP缓存，找到第一个不在使用中的IP
+        # 只对第一个候选IP做完整的ping检测，后续候选IP只在ARP缓存中检查
+        import subprocess
+        
         for offset in range(to_host - from_host):
-            if (from_host + offset) % 256 and from_host + offset not in leased:
-                return decode(from_host + offset)
+            candidate_ip_int = from_host + offset
+            if candidate_ip_int % 256 and candidate_ip_int not in leased:
+                candidate_ip = decode(candidate_ip_int)
+                
+                # 快速检查：先看ARP缓存中是否有这个IP
+                try:
+                    arp_result = subprocess.run(['ip', 'neigh', 'show', candidate_ip],
+                                               capture_output=True, text=True, timeout=2)
+                    output = arp_result.stdout.strip()
+                    if output and ('REACHABLE' in output or 'PERMANENT' in output):
+                        self.logger.warning('IP {0} is in use on network (ARP cache), skipping'.format(candidate_ip))
+                        continue
+                except Exception:
+                    pass
+                
+                # 对于第一个可用的候选IP，做完整的ping检测
+                if not self.check_ip_in_use(candidate_ip):
+                    return candidate_ip
+                else:
+                    self.logger.warning('IP {0} is in use on network, skipping'.format(candidate_ip))
         raise OutOfLeasesError('Ran out of IP addresses to lease!')
 
     def tlv_encode(self, tag, value):
@@ -202,11 +448,12 @@ class DHCPD:
     def get_mac(self, mac):
         '''
             This method converts the MAC Address from binary to
-            human-readable format for logging.
+            human-readable format for logging and storage.
+            返回格式：不带冒号小写 (如 000c296f50f2)
         '''
-        return ':'.join(map(lambda x: hex(x)[2:].zfill(2), struct.unpack('BBBBBB', mac))).upper()
+        return ''.join(map(lambda x: hex(x)[2:].zfill(2), struct.unpack('BBBBBB', mac)))
 
-    def craft_header(self, message):
+    def craft_header(self, message, is_offer):
         '''This method crafts the DHCP header using parts of the message.'''
         xid, flags, yiaddr, giaddr, chaddr = struct.unpack('!4x4s2x2s4x4s4x4s16s', message[:44])
         client_mac = chaddr[:6]
@@ -218,14 +465,41 @@ class DHCPD:
         else:
             response += struct.pack('!HHI', 0, 0x8000, 0)
         if not self.mode_proxy:
-            if self.leases[client_mac]['ip'] and self.leases[client_mac]['expire'] > time(): # OFFER
-                offer = self.leases[client_mac]['ip']
-            else: # ACK
-                offer = self.get_namespaced_static('dhcp.binding.{0}.ipaddr'.format(self.get_mac(client_mac)))
-                offer = offer if offer else self.next_ip()
-                self.leases[client_mac]['ip'] = offer
-                self.leases[client_mac]['expire'] = time() + 86400
-                self.logger.info('New Assignment - MAC: {0} -> IP: {1}'.format(self.get_mac(client_mac), self.leases[client_mac]['ip']))
+            client_mac_str = self.get_mac(client_mac)
+            current_ip = self.leases[client_mac].get('ip', '')
+            current_expire = self.leases[client_mac].get('expire', 0)
+            if is_offer:
+                # OFFER: 复用当前有效租约的 IP，否则分配新 IP
+                if current_ip and current_expire > time():
+                    offer = current_ip
+                    # 检查ARP缓存中的MAC是否与当前请求的客户端MAC一致
+                    # 如果ARP缓存中存在该IP且MAC与当前客户端不匹配，说明IP被其他设备占用
+                    arp_mac = self.get_arp_mac(offer)
+                    arp_mac_normalized = arp_mac.replace(':', '').lower() if arp_mac else None
+                    if arp_mac_normalized is not None and arp_mac_normalized != client_mac_str:
+                        self.logger.warning('ARP MAC mismatch for IP {0}: ARP={1} vs Client={2}'.format(
+                            offer, arp_mac_normalized, client_mac_str))
+                        del self.leases[client_mac]
+                        offer = self.next_ip()
+                        self.leases[client_mac]['ip'] = offer
+                        self.logger.info('New Assignment - MAC: {0} -> IP: {1} (lease: {2}s)'.format(
+                            client_mac_str, offer, self.lease_duration))
+                else:
+                    offer = self.next_ip()
+                    self.leases[client_mac]['ip'] = offer
+                    self.logger.info('New Assignment - MAC: {0} -> IP: {1} (lease: {2}s)'.format(
+                        client_mac_str, offer, self.lease_duration))
+            else:
+                # ACK: 确认 IP，优先复用当前有效租约
+                if current_ip and current_expire > time():
+                    offer = current_ip
+                else:
+                    offer = self.next_ip()
+                    self.leases[client_mac]['ip'] = offer
+                    self.logger.info('[new]]New Assignment - MAC: {0} -> IP: {1} (lease: {2}s)'.format(
+                        client_mac_str, offer, self.lease_duration))
+            # 更新租约时间
+            self.leases[client_mac]['expire'] = time() + self.lease_duration
             response += socket.inet_aton(offer) # yiaddr
         else:
             response += socket.inet_aton('0.0.0.0')
@@ -261,8 +535,8 @@ class DHCPD:
             response += self.tlv_encode(3, socket.inet_aton(router)) # router
             dns_server = self.get_namespaced_static('dhcp.binding.{0}.dns'.format(self.get_mac(client_mac)), [self.dns_server])
             dns_server = b''.join([socket.inet_aton(i) for i in dns_server])
-            response += self.tlv_encode(6, dns_server)
-            response += self.tlv_encode(51, struct.pack('!I', 86400)) # lease time
+            #response += self.tlv_encode(6, dns_server)
+            response += self.tlv_encode(51, struct.pack('!I', self.lease_duration)) # lease time
 
         # TFTP Server OR HTTP Server; if iPXE, need both
         response += self.tlv_encode(66, self.file_server)
@@ -271,39 +545,24 @@ class DHCPD:
         filename = self.get_namespaced_static('dhcp.binding.{0}.rom'.format(self.get_mac(client_mac)))
         
         if not filename:
-            if not self.ipxe or not self.leases[client_mac]['ipxe']:
-                #未启用ipxe或者非ipxe请求
-                # http://www.syslinux.org/wiki/index.php/PXELINUX#UEFI
-                if 'options' in self.leases[client_mac] and 93 in self.leases[client_mac]['options'] and not self.force_file_name:
-                    [arch] = struct.unpack("!H", self.leases[client_mac]['options'][93][0])
-                    filename = {0: 'pxelinux.0', # BIOS/default
-                                6: 'syslinux.efi32', # EFI IA32
-                                7: 'syslinux.efi64', # EFI BC, x86-64
-                                9: 'syslinux.efi64'  # EFI x86-64
-                                }[arch]
-                else:
-                    #第二次请求匹配包名
-                    filename = self.file_name
-            else:
-                #PXE首次请求
+            # 根据架构 (Option 93) 返回对应的 grub.efi
+            if 93 in self.options[client_mac]:
                 try:
                     [arch] = struct.unpack("!H", self.options[client_mac][93][0])
+                    filename = {
+                        0: 'grub_efi/x86_64.efi',        # BIOS fallback
+                        6: 'grub_efi/x86_64.efi',        # EFI IA32
+                        7: 'grub_efi/x86_64.efi',        # EFI BC, x86-64
+                        9: 'grub_efi/x86_64.efi',        # EFI x86-64
+                        11: 'grub_efi/arm64.efi',        # ARM64
+                        12: 'grub_efi/mips64el.efi',     # MIPS
+                        39: 'grub_efi/loongarch64.efi',  # LoongArch
+                        40: 'grub_efi/loongarch64.efi'   # LoongArch HTTP
+                    }.get(arch, 'grub_efi/x86_64.efi')  # 默认 x86_64
                 except:
-                    self.leases[client_mac]['ipxe'] = True
-                    arch=0
-                filename = {0: 'x86.kpxe',  # BIOS/default
-                            6: 'syslinux.efi32',  # EFI IA32
-                            7: 'ipxe_efi/x86_64.efi',  # EFI BC, x86-64
-                            9: 'ipxe_efi/x86_64.efi',  # EFI x86-64
-                            11: 'ipxe_efi/arm64.efi', #arm64
-                            12: 'BOOTMIPS.EFI', #3a400
-                            39: 'ipxe_efi/loongarch64.efi',#3a5000
-                            40: 'ipxe_efi/loongarch64.efi'#3a5000 http
-                            }[arch]
-                if 77 in self.options[client_mac] and 'iPXE'.encode() in  self.options[client_mac][77]:
-                    filename="autoexec.ipxe"
-                if opt53 == 5 and not self.leases[client_mac]['new']: # ACK
-                    self.leases[client_mac]['ipxe'] = False
+                    filename = 'grub_efi/x86_64.efi'
+            else:
+                filename = self.file_name if self.file_name else 'grub_efi/x86_64.efi'
         response += self.tlv_encode(67, filename.encode('ascii') + b'\x00')
         if self.mode_proxy:
             response += self.tlv_encode(60, 'PXEClient')
@@ -313,19 +572,19 @@ class DHCPD:
 
     def dhcp_offer(self, message):
         '''This method responds to DHCP discovery with offer.'''
-        client_mac, header_response = self.craft_header(message)
+        client_mac, header_response = self.craft_header(message, True)
         options_response = self.craft_options(2, client_mac) # DHCPOFFER
         response = header_response + options_response
-        self.logger.debug('DHCPOFFER - Sending the following')
-        self.logger.debug('<--BEGIN HEADER-->')
-        self.logger.debug('{0}'.format(repr(header_response)))
-        self.logger.debug('<--END HEADER-->')
-        self.logger.debug('<--BEGIN OPTIONS-->')
-        self.logger.debug('{0}'.format(repr(options_response)))
-        self.logger.debug('<--END OPTIONS-->')
-        self.logger.debug('<--BEGIN RESPONSE-->')
-        self.logger.debug('{0}'.format(repr(response)))
-        self.logger.debug('<--END RESPONSE-->')
+        #self.logger.debug('DHCPOFFER - Sending the following')
+        #self.logger.debug('<--BEGIN HEADER-->')
+        #self.logger.debug('{0}'.format(repr(header_response)))
+        #self.logger.debug('<--END HEADER-->')
+        #self.logger.debug('<--BEGIN OPTIONS-->')
+        #self.logger.debug('{0}'.format(repr(options_response)))
+        #self.logger.debug('<--END OPTIONS-->')
+        #self.logger.debug('<--BEGIN RESPONSE-->')
+        #self.logger.debug('{0}'.format(repr(response)))
+        #self.logger.debug('<--END RESPONSE-->')
         try:
             self.sock.sendto(response, (self.broadcast, 68))
         except:
@@ -337,41 +596,35 @@ class DHCPD:
 
     def dhcp_ack(self, message):
         '''This method responds to DHCP request with acknowledge.'''
-        client_mac, header_response = self.craft_header(message)
+        client_mac, header_response = self.craft_header(message, False)
         options_response = self.craft_options(5, client_mac) # DHCPACK
         response = header_response + options_response
-        self.logger.debug('DHCPACK - Sending the following')
-        self.logger.debug('<--BEGIN HEADER-->')
-        self.logger.debug('{0}'.format(repr(header_response)))
-        self.logger.debug('<--END HEADER-->')
-        self.logger.debug('<--BEGIN OPTIONS-->')
-        self.logger.debug('{0}'.format(repr(options_response)))
-        self.logger.debug('<--END OPTIONS-->')
-        self.logger.debug('<--BEGIN RESPONSE-->')
-        self.logger.debug('{0}'.format(repr(response)))
-        self.logger.debug('<--END RESPONSE-->')
-        with open('config/leases.json', 'r') as file:
-            config=json.load(file)
-        # 深度合并
-        for key, value in process_dict(self.leases).items():
-            if key in config and isinstance(config[key], dict) and isinstance(value, dict):
-                config[key].update(value)
-            else:
-                config[key] = value
-        with open('config/leases.json', 'w') as file:
-            json.dump(config, file, indent=4)
+        #self.logger.debug('DHCPACK - Sending the following')
+        #self.logger.debug('<--BEGIN HEADER-->')
+        #self.logger.debug('{0}'.format(repr(header_response)))
+        #self.logger.debug('<--END HEADER-->')
+        #self.logger.debug('<--BEGIN OPTIONS-->')
+        #self.logger.debug('{0}'.format(repr(options_response)))
+        #self.logger.debug('<--END OPTIONS-->')
+        #self.logger.debug('<--BEGIN RESPONSE-->')
+        #self.logger.debug('{0}'.format(repr(response)))
+        #self.logger.debug('<--END RESPONSE-->')
+        # 先发送ACK响应，再异步保存租约，避免文件IO阻塞响应
         try:
             self.sock.sendto(response, (self.broadcast, 68))
         except:
             #解决终端网卡重启问题
             time2.sleep(5)
             self.sock.sendto(response, (self.broadcast, 68))
+        # 异步保存租约，避免文件锁阻塞后续DHCP请求处理
+        # 注意：_save_leases 内部有文件锁，多线程安全
+        self._executor.submit(self._save_leases)
 
     def validate_req(self, client_mac):
         client_mac_str = self.get_mac(client_mac)
-        self.logger.debug('Received request from {0}'.format(client_mac_str))
-        self.logger.debug('{0}'.format(repr(self.options[client_mac])))
-        self.logger.debug('<--END OPTIONS-->')
+        #self.logger.debug('Received request from {0}'.format(client_mac_str))
+        #self.logger.debug('{0}'.format(repr(self.options[client_mac])))
+        #self.logger.debug('<--END OPTIONS-->')
         # 黑名单检查（优先级最高）
         if client_mac_str in self.blacklist:
             self.logger.info('Blacklisted client request rejected from {0}'.format(client_mac_str))
@@ -380,15 +633,10 @@ class DHCPD:
         if self.whitelist and client_mac_str not in self.whitelist:
             self.logger.info('Non-whitelisted client request rejected from {0}'.format(client_mac_str))
             return False
-        #客户端重启
-        if 60 in self.options[client_mac] and 'PXEClient'.encode() in self.options[client_mac][60][0] and 77 not in  self.options[client_mac]:
-            self.logger.info('iPXE client request received from {0}'.format(self.get_mac(client_mac)))
-            self.leases[client_mac]['ipxe'] = True
-            self.leases[client_mac]['new'] = True
-            return True
+        # PXE 客户端请求
         if 60 in self.options[client_mac] and 'PXEClient'.encode() in self.options[client_mac][60][0]:
             self.logger.info('PXE client request received from {0}'.format(self.get_mac(client_mac)))
-            self.leases[client_mac]['new'] = False
+            self.leases[client_mac]['new'] = True
             return True
 
         #安装期间获取
@@ -404,18 +652,24 @@ class DHCPD:
         '''Main listen loop.'''
         while True:
             message, address = self.sock.recvfrom(1024)
+            # 使用线程池处理每个请求，避免阻塞主循环
+            self._executor.submit(self._handle_message, message, address)
+
+    def _handle_message(self, message, address):
+        '''处理单个DHCP消息（在独立线程中执行）'''
+        try:
             [client_mac] = struct.unpack('!28x6s', message[:34])
-            self.logger.debug('Received message')
-            self.logger.debug('<--BEGIN MESSAGE-->')
-            self.logger.debug('{0}'.format(repr(message)))
-            self.logger.debug('<--END MESSAGE-->')
             self.options[client_mac] = self.tlv_parse(message[240:])
-            self.logger.debug('Parsed received options')
-            self.logger.debug('<--BEGIN OPTIONS-->')
-            self.logger.debug('{0}'.format(repr(self.options[client_mac])))
-            self.logger.debug('<--END OPTIONS-->')
+            #self.logger.debug('Received message')
+            #self.logger.debug('<--BEGIN MESSAGE-->')
+            #self.logger.debug('{0}'.format(repr(message)))
+            #self.logger.debug('<--END MESSAGE-->')
+            #self.logger.debug('Parsed received options')
+            #self.logger.debug('<--BEGIN OPTIONS-->')
+            #self.logger.debug('{0}'.format(repr(self.options[client_mac])))
+            #self.logger.debug('<--END OPTIONS-->')
             if not self.validate_req(client_mac):
-                continue
+                return
             type = ord(self.options[client_mac][53][0]) # see RFC2131, page 10
             if type == TYPE_53_DHCPDISCOVER:
                 self.logger.info('Sending DHCPOFFER to {0}'.format(self.get_mac(client_mac)))
@@ -427,4 +681,6 @@ class DHCPD:
                 self.logger.info('Sending DHCPACK to {0}'.format(self.get_mac(client_mac)))
                 self.dhcp_ack(message)
             else:
-                self.logger.debug('Unhandled DHCP message type {0} from {1}'.format(type, self.get_mac(client_mac)))
+                self.logger.info('Unhandled DHCP message type {0} from {1}'.format(type, self.get_mac(client_mac)))
+        except Exception as e:
+            self.logger.error('Error handling message: {0}'.format(e))
diff --git a/services/helpers.py b/services/helpers.py
index e309044a572993ec0cb4cf9d3bafbfa83a9f0399..a46592339d37f1134b2d6d1865465e9026a9c83f 100755
--- a/services/helpers.py
+++ b/services/helpers.py
@@ -6,10 +6,19 @@ This file contains helper functions used throughout the PXE services
 
 import os.path
 import logging
+import fcntl
+import json
+import os
+from contextlib import contextmanager
 
 class PathTraversalException(Exception):
     pass
 
+LEASES_FILE = 'config/leases.json'
+INSTALL_STATUS_FILE = 'config/install_status.json'
+LOCK_FILE = 'config/leases.json.lock'
+DEFAULT_LEASE_DURATION = 7200
+
 def normalize_path(base, filename):
     '''
         Join and normalize a base path and filename.
@@ -49,3 +58,74 @@ def get_child_logger(logger, name):
             Logger: new Logger with `name` appended
     '''
     return logging.getLogger("{0}.{1}".format(logger.name, name))
+
+@contextmanager
+def json_lock(blocking=True):
+    '''
+        统一 JSON 文件锁上下文管理器。
+        所有对 leases.json / install_status.json 的并发读写都通过此锁同步。
+        DHCP 保存线程可使用 blocking=False 实现非阻塞保存。
+    '''
+    lock = open(LOCK_FILE, 'w')
+    flags = fcntl.LOCK_EX
+    if not blocking:
+        flags |= fcntl.LOCK_NB
+    acquired = False
+    try:
+        fcntl.flock(lock.fileno(), flags)
+        acquired = True
+    except IOError:
+        lock.close()
+        if blocking:
+            raise
+        yield False
+        return
+    try:
+        yield True
+    finally:
+        if acquired:
+            try:
+                fcntl.flock(lock.fileno(), fcntl.LOCK_UN)
+            except IOError:
+                pass
+        lock.close()
+
+def read_json_file(filepath):
+    '''
+        在统一文件锁保护下读取 JSON 文件。
+        文件不存在或解析失败时返回空 dict。
+    '''
+    with json_lock():
+        try:
+            with open(filepath, 'r') as f:
+                return json.load(f)
+        except (IOError, json.JSONDecodeError, FileNotFoundError):
+            return {}
+
+def atomic_write_json(filepath, data):
+    '''
+        原子写 JSON（调用方需已持有 json_lock）。
+        先写入 .tmp 文件，再通过 os.replace 原子替换目标文件。
+    '''
+    tmp = filepath + '.tmp'
+    with open(tmp, 'w') as f:
+        json.dump(data, f, indent=4)
+    os.replace(tmp, filepath)
+
+def write_json_file(filepath, data):
+    '''
+        在统一文件锁保护下原子写 JSON 文件。
+    '''
+    with json_lock():
+        atomic_write_json(filepath, data)
+
+def get_lease_duration():
+    '''
+        读取配置返回 DHCP 租约时长，读取失败时使用默认值。
+    '''
+    try:
+        with open('config/config.json', 'r') as f:
+            cfg = json.load(f)
+            return int(cfg.get('DHCP_LEASE_DURATION', DEFAULT_LEASE_DURATION))
+    except Exception:
+        return DEFAULT_LEASE_DURATION
diff --git a/services/http.py b/services/http.py
index ad3edf4fa53e792ac0843714522a77da04bce4a8..3c9599d52dffc70a86dac90322d358ac5782c90d 100755
--- a/services/http.py
+++ b/services/http.py
@@ -12,6 +12,7 @@ from urllib.parse import parse_qs, unquote, urlparse
 import queue
 from services import helpers
 import json
+from time import time
 MAX_REQUEST_SIZE = 1024 * 1024 * 1024  # 10MB
 ALLOWED_METHODS = ['GET', 'POST']
 CHUNK_SIZE = 4096 * 1024  # 4MB分块大小
@@ -235,7 +236,7 @@ def saveandrestart(params):
         json.dump(config, file, indent=4)
         file.truncate()
     write_config(config)
-    output = subprocess.check_output(['bash', 'scripts/gen_boot_ipxe.sh'], text=True)
+    output = subprocess.check_output(['bash', 'scripts/gen_boot_menu.sh'], text=True)
     restart_thread = threading.Thread(target=restartservice)
     restart_thread.daemon = True
     restart_thread.start()
@@ -262,7 +263,7 @@ def setserver(params):
     restart_thread.daemon = True
     restart_thread.start()
     if http_port != old_http_port:
-        output = subprocess.check_output(['bash', 'scripts/gen_boot_ipxe.sh'], text=True)
+        output = subprocess.check_output(['bash', 'scripts/gen_boot_menu.sh'], text=True)
     # 返回响应
     return format_response(200, {"code": 0, "msg": f"重启成功"})
 
@@ -350,18 +351,11 @@ def setisoipxe(params):
         if grubcfg:
             with open(directory+ipxename+"/grub.cfg_tpl",'w') as file:
                 file.writelines(base64.b64decode(grubcfg).decode())
-        if not os.path.exists(directory+ipxename+"/grub.efi"):
-            import hashlib
-            md5_hash = hashlib.md5()
-            isopath="../iso/"+isoname
-            md5_hash.update(isopath.encode('utf-8'))
-            md5name = md5_hash.hexdigest()[:9]
-            shutil.copy(directory+md5name+"/grub.efi",directory+ipxename)
         autoinstallcfg = params.get('autoinstallcfg')
         if autoinstallcfg:
             with open(directory+ipxename+"/autoinstall.cfg_tpl",'w') as file:
                 file.writelines(base64.b64decode(autoinstallcfg).decode())
-        output = subprocess.check_output(['bash', 'scripts/gen_boot_ipxe.sh','--notremount'], text=True)
+        output = subprocess.check_output(['bash', 'scripts/gen_boot_menu.sh','--notremount'], text=True)
     except Exception as e:
         code=1
         msg="发生错误："+str(e)
@@ -393,7 +387,7 @@ def restartservice(params=""):
 
 @route('/web/rescan')
 def rescan(params):
-    output = subprocess.check_output(['bash', 'scripts/gen_boot_ipxe.sh','--rescan'], text=True)
+    output = subprocess.check_output(['bash', 'scripts/gen_boot_menu.sh','--rescan'], text=True)
     restart_thread = threading.Thread(target=restartservice)
     restart_thread.daemon = True
     restart_thread.start()
@@ -407,16 +401,30 @@ def statusreport(params):
     msg = params.get('msg')
     mac = params.get('mac')
     
-    with open('config/leases.json', 'r') as file:
-        config=json.load(file)
-        file.close()
-        if mac in config:
-            config[mac]["progress"]=progress
-            config[mac]["status"]=status
-            config[mac]["msg"]=msg
-            with open('config/leases.json', 'w') as file:
-                json.dump(config, file, indent=4)
-                file.close()
+    # 在统一文件锁保护下更新 install_status.json，并刷新 leases.json 中对应 MAC 的 expire
+    try:
+        with helpers.json_lock():
+            try:
+                with open(helpers.INSTALL_STATUS_FILE, 'r') as file:
+                    install_status = json.load(file)
+            except FileNotFoundError:
+                install_status = {}
+            install_status[mac] = install_status.get(mac, {})
+            install_status[mac]['progress'] = progress
+            install_status[mac]['status'] = status
+            install_status[mac]['msg'] = msg
+            helpers.atomic_write_json(helpers.INSTALL_STATUS_FILE, install_status)
+            
+            try:
+                with open(helpers.LEASES_FILE, 'r') as file:
+                    leases = json.load(file)
+            except FileNotFoundError:
+                leases = {}
+            if mac in leases:
+                leases[mac]['expire'] = time() + helpers.get_lease_duration()
+                helpers.atomic_write_json(helpers.LEASES_FILE, leases)
+    except Exception:
+        pass
 
     return format_response(200, {"code": 0, "msg": msg})
 
@@ -425,23 +433,32 @@ def statusreport(params):
 def getclientlist(params):
     clientlist=[]
     msg=""
-    with open('config/leases.json', 'r') as file:
-        config=json.load(file)
-        file.close()
-        for key,entry in config.items():
-            clientinfo={}
-            clientinfo["mac"]=key
-            clientinfo["ip"]=config[key]["ip"]
-            clientinfo["isoname"]=""
-            clientinfo["progress"]=0
-            clientinfo["status"]="等待开始"
+    try:
+        # 在统一文件锁保护下合并 leases.json 与 install_status.json
+        with helpers.json_lock():
             try:
-                clientinfo["isoname"]=config[key]["isoname"]
-                clientinfo["progress"]=config[key]["progress"]
-                clientinfo["status"]=config[key]["msg"]
-            except:
-                pass
-            clientlist.append(clientinfo)
+                with open(helpers.LEASES_FILE, 'r') as file:
+                    leases = json.load(file)
+            except FileNotFoundError:
+                leases = {}
+            try:
+                with open(helpers.INSTALL_STATUS_FILE, 'r') as file:
+                    install_status = json.load(file)
+            except FileNotFoundError:
+                install_status = {}
+            for key, entry in leases.items():
+                if not isinstance(entry, dict):
+                    continue
+                clientinfo={}
+                clientinfo["mac"]=key
+                clientinfo["ip"]=entry.get('ip', '')
+                clientinfo["isoname"]=install_status.get(key, {}).get('isoname', '')
+                clientinfo["progress"]=install_status.get(key, {}).get('progress', 0)
+                clientinfo["status"]=install_status.get(key, {}).get('msg', '等待开始')
+                clientlist.append(clientinfo)
+    except Exception as e:
+        http_logger.error(f"获取客户端列表异常: {str(e)}")
+        return format_response(200, {"code": 1, "msg": str(e), "data": []})
 
     return format_response(200, {"code": 0, "msg": msg, "data":clientlist})
 
@@ -710,29 +727,6 @@ class HTTPServer:
             # 获取并清洗路径（关键修改点）
             full_path = unquote(headers['path'])
             parsed_path = urlparse(full_path).path
-            #如果加载过grub，则保存对应grub.cfg路径
-            if "grub.efi" in parsed_path:
-                with open('config/leases.json', 'r') as file:
-                    config=json.load(file)
-                    file.close()
-                    for key, entry in config.items():
-                        if isinstance(entry, dict) and entry.get("ip") == addr[0]:
-                            config[key]["filename"]=os.path.dirname(parsed_path)[1:]+"/grub.cfg"
-
-                            configini = configparser.ConfigParser(
-                                allow_no_value=True,        # 允许空值
-                                delimiters=('='),           # 分隔符
-                                comment_prefixes=('#', ';') # 注释标识
-                            )
-                            config_file = "netboot"+"/"+os.path.dirname(parsed_path)[1:]+"/config.ini"
-                            configini.read(config_file, encoding='utf-8')
-                            isoname = configini.get('config', 'isoname')
-                            config[key]["isoname"]=isoname
-                            break
-                    
-                with open('config/leases.json', 'w') as file:
-                    json.dump(config, file, indent=4)
-
             relative_path = parsed_path.lstrip('/')
             if not self.is_safe_path(relative_path):
                 client.sendall(self.error_response(403, "Forbidden path").encode())
diff --git a/services/tftp.py b/services/tftp.py
index 23003d615c7f9acf90ac3a234f7fce9bab82499a..fcf66e2fda21334ce45cef81b916750b32e67be0 100755
--- a/services/tftp.py
+++ b/services/tftp.py
@@ -11,6 +11,8 @@ import select
 import time
 import math
 import json
+import configparser
+import fcntl
 from services import helpers
 
 class ParentSocket(socket.socket):
@@ -60,7 +62,7 @@ class Client:
         response = struct.pack('!HH', 3, self.block % 65536)
         response += data
         self.sock.sendto(response, self.address)
-        self.logger.debug('Sending block {0}/{1}'.format(self.block, self.lastblock))
+        #self.logger.debug('Sending block {0}/{1}'.format(self.block, self.lastblock))
         self.retries -= 1
         self.sent_time = time.time()
 
@@ -87,17 +89,50 @@ class Client:
         '''
             Determines if the file exists under the netboot_directory,
             and if it is a file; if not, send an error.
+            当客户端请求 grub.cfg 时，从请求路径中提取 ISO ID，
+            更新 install_status.json 中对应客户端的 isoname 信息。
         '''
         filename = self.message.split(b'\x00')[0].decode('ascii').lstrip('/')
-        if "grub.cfg" in filename :
-            try:
-                with open('config/leases.json', 'r') as file:
-                    config=json.load(file)
-                    file.close()
-                    mac=[key for key, entry in config.items() if entry.get("ip") == self.address[0]][0]
-                    filename=config[mac]["filename"]
-            except:
-                pass
+        if "grub.cfg" in filename:
+            # 从请求路径中提取 ISO ID，例如 config/8890262b2/grub.cfg -> 8890262b2
+            isoid = filename.split('/')[-2] if filename.count('/') >= 2 else None
+            if isoid:
+                try:
+                    # 在统一文件锁保护下读取 leases.json 并更新 install_status.json
+                    with helpers.json_lock():
+                        try:
+                            with open(helpers.LEASES_FILE, 'r') as file:
+                                leases = json.load(file)
+                        except FileNotFoundError:
+                            leases = {}
+                        try:
+                            with open(helpers.INSTALL_STATUS_FILE, 'r') as file:
+                                install_status = json.load(file)
+                        except FileNotFoundError:
+                            install_status = {}
+                        matched = False
+                        for key, entry in leases.items():
+                            if isinstance(entry, dict) and entry.get("ip") == self.address[0]:
+                                matched = True
+                                # 读取 config.ini 获取 isoname
+                                configini = configparser.ConfigParser(
+                                    allow_no_value=True,
+                                    delimiters=('='),
+                                    comment_prefixes=('#', ';')
+                                )
+                                config_file = f"netboot/config/{isoid}/config.ini"
+                                configini.read(config_file, encoding='utf-8')
+                                try:
+                                    isoname = configini.get('config', 'isoname')
+                                    install_status[key] = install_status.get(key, {})
+                                    install_status[key]['isoname'] = isoname
+                                except:
+                                    pass
+                                break
+                        if matched:
+                            helpers.atomic_write_json(helpers.INSTALL_STATUS_FILE, install_status)
+                except Exception:
+                    pass
         try:
             filename = helpers.normalize_path(self.netboot_directory, filename)
         except helpers.PathTraversalException: