GuanM/reinstall
1
0
Fork 0
mirror of https://github.com/bin456789/reinstall.git synced 2025-06-08 21:39:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

windows: 修复 vista 没有 InstallationType 导致报错

Browse Source
This commit is contained in:
bin456789 2025-05-05 21:27:08 +08:00
parent 318f0e589a
commit 2fb31ed7c3
No known key found for this signature in database
GPG Key ID: EE301B386DE6C11B
1 changed files with 27 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
trans.sh
View File

@ -5351,13 +5351,29 @@ hivexget() {
ash "$(which hivexget)" "$@" ash "$(which hivexget)" "$@"
} }
get_installation_type_from_windows_drive() { get_windows_type_from_windows_drive() {
local os_dir=$1 local os_dir=$1
apk add hivex apk add hivex
hive=$(find_file_ignore_case $os_dir/Windows/System32/config/SOFTWARE) software_hive=$(find_file_ignore_case $os_dir/Windows/System32/config/SOFTWARE)
hivexget $hive '\Microsoft\Windows NT\CurrentVersion' InstallationType system_hive=$(find_file_ignore_case $os_dir/Windows/System32/config/SYSTEM)
installation_type=$(hivexget $software_hive '\Microsoft\Windows NT\CurrentVersion' InstallationType || true)
product_type=$(hivexget $system_hive '\ControlSet001\Control\ProductOptions' ProductType || true)
apk del hivex apk del hivex
# 根据 win11 multi-session 的情况
# InstallationType 比 ProductType 准确
# Vista wim 和注册表都没有 InstallationType
case "$installation_type" in
Client | Embedded) echo client ;;
Server | 'Server Core') echo server ;;
*) case "$product_type" in
WinNT) echo client ;;
ServerNT) echo server ;;
*) error_and_exit "Unknown Windows Type" ;;
esac ;;
esac
} }
get_windows_arch_from_windows_drive() { get_windows_arch_from_windows_drive() {
@ -5506,7 +5522,7 @@ install_windows() {
# 用内核版本号筛选驱动 # 用内核版本号筛选驱动
# 使得可以安装 Hyper-V Server / Azure Stack HCI 等 Windows Server 变种 # 使得可以安装 Hyper-V Server / Azure Stack HCI 等 Windows Server 变种
# 7601.24214.180801-1700.win7sp1_ldr_escrow_CLIENT_ULTIMATE_x64FRE_en-us.iso wim 没有 Installation Type # 7601.24214.180801-1700.win7sp1_ldr_escrow_CLIENT_ULTIMATE_x64FRE_en-us.iso wim 没有 Installation Type
# 因此改成从注册表获取 # Vista wim 和 注册表 都没有 InstallationType
if false; then if false; then
nt_ver=$(get_selected_image_prop "Major Version").$(get_selected_image_prop "Minor Version") nt_ver=$(get_selected_image_prop "Major Version").$(get_selected_image_prop "Minor Version")
build_ver=$(get_selected_image_prop "Build") build_ver=$(get_selected_image_prop "Build")
@ -5521,7 +5537,7 @@ install_windows() {
wimmount "$iso_install_wim" "$image_index" /wim/ wimmount "$iso_install_wim" "$image_index" /wim/
ntoskrnl_exe=$(find_file_ignore_case /wim/Windows/System32/ntoskrnl.exe) ntoskrnl_exe=$(find_file_ignore_case /wim/Windows/System32/ntoskrnl.exe)
get_windows_version_from_dll "$ntoskrnl_exe" get_windows_version_from_dll "$ntoskrnl_exe"
installation_type=$(get_installation_type_from_windows_drive /wim) windows_type=$(get_windows_type_from_windows_drive /wim)
{ {
find_file_ignore_case /wim/Windows/System32/sacsess.exe && has_sac=true || has_sac=false find_file_ignore_case /wim/Windows/System32/sacsess.exe && has_sac=true || has_sac=false
find_file_ignore_case /wim/Windows/INF/stornvme.inf && has_stornvme=true || has_stornvme=false find_file_ignore_case /wim/Windows/INF/stornvme.inf && has_stornvme=true || has_stornvme=false
@ -5540,17 +5556,12 @@ install_windows() {
support_sha256=true support_sha256=true
fi fi
case "$installation_type" in product_ver=$(
Client | Embedded) case "$windows_type" in
windows_type=client client) get_client_name_by_build_ver "$build_ver" ;;
product_ver=$(get_client_name_by_build_ver "$build_ver") server) get_server_name_by_build_ver "$build_ver" ;;
;; esac
Server | 'Server Core') )
windows_type=server
product_ver=$(get_server_name_by_build_ver "$build_ver")
;;
*) error_and_exit "Unknown Installation Type: $installation_type" ;;
esac
info "Selected image info" info "Selected image info"
echo "Image Name: $image_name" echo "Image Name: $image_name"