From eb35d6914cff3ad15d9bd8d64b6a94e12d255aa5 Mon Sep 17 00:00:00 2001 From: bin456789 Date: Fri, 13 Sep 2024 00:00:30 +0800 Subject: [PATCH] =?UTF-8?q?kali:=20=E4=BF=AE=E5=A4=8D=E6=89=BE=E4=B8=8D?= =?UTF-8?q?=E5=88=B0=E7=B3=BB=E7=BB=9F=E7=9B=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.en.md | 4 ++-- README.md | 2 +- debian.cfg | 4 ++-- get-xda.sh | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/README.en.md b/README.en.md index baec219..2cc5aea 100644 --- a/README.en.md +++ b/README.en.md @@ -13,7 +13,7 @@ One-Click Script to Reinstall System [中文](README.md) - Supports installation of 17 common Linux distributions - Supports installation of official Windows ISO, automatically finds ISO links, and integrates virtual machine drivers - Supports installation in any direction, i.e., `Linux to Linux`, `Linux to Windows`, `Windows to Windows`, `Windows to Linux` -- No need to input IP parameters; automatically recognizes dynamic and static IPs, supports `/32`, `/128`, `gateway outside subnet`, `pure IPv6`, `dual NIC` and other special network configurations +- No need to input IP parameters; automatically recognizes dynamic and static IPs, supports `/32`, `/128`, `gateway outside subnet`, `IPv6 only`, `dual NIC` and other special network configurations - Specially optimized for low-spec servers, requires less memory than the official netboot - Uses partition table ID to identify hard drives throughout the process, ensuring no wrong disk is written - Supports BIOS and EFI boot, and ARM architecture @@ -242,7 +242,7 @@ bash reinstall.sh windows \ The following website provides iso links. - (Recommended, iso sourced from official channels, updated monthly, includes the latest patches) -- (Need to open it with a mobile User-Agent) +- (Need to open it with a non-Windows User-Agent) - - (Preview) - diff --git a/README.md b/README.md index dcd55f7..04eeb7e 100644 --- a/README.md +++ b/README.md @@ -242,7 +242,7 @@ bash reinstall.sh windows \ 以下网站可找到 iso 链接 - (推荐，iso 来自官方，每月更新，包含最新补丁) -- (需用手机 User-Agent 打开) +- (需用非 Windows User-Agent 打开) - - (预览版) - diff --git a/debian.cfg b/debian.cfg index 339f30d..4d527fe 100644 --- a/debian.cfg +++ b/debian.cfg @@ -123,7 +123,7 @@ d-i preseed/early_command string true; \ # efi 分区大小未改变时，不会被格式化，因此需要手动删除旧系统的 efi 文件 # os-prober 卡太久，因此跳过 d-i partman/early_command string true; \ - confhome="$(grep -o 'extra_confhome=[^ ]*' /proc/cmdline | cut -d= -f2)"; \ + eval "$(grep -o 'extra_confhome=[^ ]*' /proc/cmdline | sed 's/^extra_//')"; \ postinst=/var/lib/dpkg/info/bootstrap-base.postinst; \ cp $postinst $postinst.orig; \ @@ -161,7 +161,7 @@ d-i partman/early_command string true; \ # 另一种方法处理 cloudcone # if [ "$link_grub_dir" = 1 ]; then mkdir /target/boot/grub2; echo 'chainloader (hd0)+1' >/target/boot/grub2/grub.cfg; fi; \ d-i preseed/late_command string true; \ - link_grub_dir="$(grep -o 'extra_link_grub_dir=[^ ]*' /proc/cmdline | cut -d= -f2)"; \ + eval "$(grep -o 'extra_link_grub_dir=[^ ]*' /proc/cmdline | sed 's/^extra_//')"; \ if [ "$link_grub_dir" = 1 ]; then ln -s grub /target/boot/grub2; fi; \ in-target systemctl enable ssh; \ diff --git a/get-xda.sh b/get-xda.sh index 6da568d..7a55152 100644 --- a/get-xda.sh +++ b/get-xda.sh @@ -10,7 +10,7 @@ get_all_disks() { get_xda() { # 如果没找到 main_disk 或 xda # 返回假的值，防止意外地格式化全部盘 - main_disk="$(grep -o 'extra_main_disk=[^ ]*' /proc/cmdline | cut -d= -f2)" + eval "$(grep -o 'extra_main_disk=[^ ]*' /proc/cmdline | sed 's/^extra_//')" if [ -z "$main_disk" ]; then echo 'MAIN_DISK_NOT_FOUND'