From 4c50f00a0f78dcfb6c2464b772419706ad5d3703 Mon Sep 17 00:00:00 2001 From: "Michael H.G. Schmidt" Date: Sat, 28 Sep 2024 16:25:23 +0200 Subject: [PATCH] added UEFI compatibility --- 05_FormatMedia.cmd | 6 +++++ 06_Copy2Media.cmd | 10 ++++---- image/autounattend_template.xml | 41 +------------------------------- image/finish-boot.cmd | 14 ++++++++--- image/format-disk.cmd | 16 +++++++++++++ image/installer.exe | Bin 62464 -> 62464 bytes source/installer.pb | 10 +++++--- 7 files changed, 47 insertions(+), 50 deletions(-) create mode 100644 image/format-disk.cmd diff --git a/05_FormatMedia.cmd b/05_FormatMedia.cmd index 61c4b13..7592173 100644 --- a/05_FormatMedia.cmd +++ b/05_FormatMedia.cmd @@ -44,6 +44,11 @@ set DISK= goto askdisk :CONT1 +echo. +echo IMPORTANT: USE === fat32 === for UEFI systems! +echo WARNING: DO NOT(!) USE [ exfat ] for UEFI boot! +echo. + set FS=fat32 :askfs echo. @@ -55,6 +60,7 @@ set FS=fat32 ) if /i "%FS%" EQU "exfat" ( echo IMPORTANT: some old BIOS versions can't use exfat! + echo WARNING: UEFI BIOS can't use exfat for booting! GOTO CONT2 ) if /i "%FS%" EQU "" ( diff --git a/06_Copy2Media.cmd b/06_Copy2Media.cmd index 57da1a8..4638325 100644 --- a/06_Copy2Media.cmd +++ b/06_Copy2Media.cmd @@ -77,10 +77,6 @@ for %%P in (drivers scripts source optional personal apps custom) do ( ) ) -echo. -echo deleting ftpsettings.cmd ... -del /F /Q %DRIVE%\tools\custom\ftpsettings.cmd - echo. echo copying autoconfig starter script to %DRIVE% ... copy /Y image\StartAutoConfig.cmd %DRIVE%\ @@ -110,6 +106,12 @@ if EXIST %DRIVE%\tools\%SNAPCONTROL_INI% ( tools\searchreplace %DRIVE%\tools\%SNAPCONTROL_INI% "^.*MAILPASS.*=.*" "MailPass = DELETED" ) +echo. +echo CLEANUP ... +del /F /Q %DRIVE%\tools\custom\ftpsettings.cmd +del /F /Q %DRIVE%\Auto-Saved*.* +del /F /Q %DRIVE%\NTLite.log + echo. echo ====== echo READY. diff --git a/image/autounattend_template.xml b/image/autounattend_template.xml index 2daf84b..ec8525e 100644 --- a/image/autounattend_template.xml +++ b/image/autounattend_template.xml @@ -12,50 +12,11 @@ ___MYLANG___ - - OnError - - - - - 1 - 128 - Primary - - - - 2 - Primary - true - - - - - - 1 - 1 - NTFS - - true - - - - 2 - 2 - C - - NTFS - - - 0 - true - - 0 - 2 + 3 OnError diff --git a/image/finish-boot.cmd b/image/finish-boot.cmd index 15ec748..9743863 100644 --- a/image/finish-boot.cmd +++ b/image/finish-boot.cmd @@ -49,17 +49,25 @@ echo replacing setup.exe with our installer utility ... copy /Y installer.exe %BOOT%\setup.exe echo. -rem prepare unattended xml files ... -echo copying config file for unattended install [ BIOS ]... +rem prepare file for unattended installation ... +echo copying config file for unattended installation ... copy /Y autounattend_template.xml %BOOT%\autounattend.xml -rem prepare BIOS version ... +rem file in users and passwords ... ..\tools\searchreplace %BOOT%\autounattend.xml ___MYUSER___ "%localadmin%" ..\tools\searchreplace %BOOT%\autounattend.xml ___MYNAME___ "%localadmin_name%" ..\tools\searchreplace %BOOT%\autounattend.xml ___MYPASS___ "%localadmin_password%" /S ..\tools\searchreplace %BOOT%\autounattend.xml ___MYLANG___ "%LANG%" echo. +echo copying config file for disk format [ BIOS ]... +copy /Y format-BIOS.txt %BOOT% +echo copying config file for disk format [ UEFI ]... +copy /Y format-UEFI.txt %BOOT% +echo copying disk formatting script ... +copy /Y format-disk.cmd %BOOT% + +rem provide snapshot64.exe ... if EXIST ..\software\snapshot64_licensed.exe ( echo copying LICENSED snapshot64.exe to boot image ... copy /Y ..\software\snapshot64_licensed.exe %BOOT%\snapshot64.exe diff --git a/image/format-disk.cmd b/image/format-disk.cmd new file mode 100644 index 0000000..17fe091 --- /dev/null +++ b/image/format-disk.cmd @@ -0,0 +1,16 @@ +@echo off +wpeinit && echo INFO: wpeinit OK +wpeutil UpdateBootInfo > NUL && echo INFO: wpeutil UpdateBootInfo OK + +for /f "tokens=2* delims= " %%A in ('reg query HKLM\System\CurrentControlSet\Control /v PEFIRMWAREType') do set FIRMWARE=%%B + +if %FIRMWARE%==0x1 ( + echo FIRMWARE=%FIRMWARE% [BIOS] + echo ========================== + diskpart /s %SystemDrive%\format-BIOS.txt +) else ( + echo FIRMWARE=%FIRMWARE% [UEFI] + echo ========================== + diskpart /s %SystemDrive%\format-UEFI.txt +) + diff --git a/image/installer.exe b/image/installer.exe index 2314c5ef7147e7b17a8ee6aedb5032a6173e2499..eb7af87ac9df689790827640d6882ddd6ddc67b7 100644 GIT binary patch delta 12474 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 E7qadh!vFvP delta 12300 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 OisWBT`r}_?3;qXlM%gC- diff --git a/source/installer.pb b/source/installer.pb index ff9bd40..3d205de 100644 --- a/source/installer.pb +++ b/source/installer.pb @@ -30,9 +30,13 @@ Procedure StartInstallation() "REALLY DELETE ALL Data on DRIVE [ C: ] ?", #PB_MessageRequester_YesNo | #PB_MessageRequester_Warning) - ; start installation ... If Result = #PB_MessageRequester_Yes + ; format disk ... + dummy=system(SYS$ + "\windows\system32\cmd.exe /C " + SYS$ + "\format-disk.cmd") + + ; start installation ... dummy=system(SYS$ + "\winsetup.exe /unattend:" + SYS$ + "\autounattend.xml") + End EndIf @@ -62,14 +66,14 @@ Procedure StartCMD() #PB_MessageRequester_Info) ; start a command shell ... - dummy=system(SYS$ + "\windows\system32\cmd.exe /C start /D "+SYS$+"\ "+SYS$+"\windows\system32\cmd.exe /K wpeutil initializenetwork") + dummy=system(SYS$ + "\windows\system32\cmd.exe /C start /D " + SYS$ + "\ " + SYS$ + "\windows\system32\cmd.exe /K wpeutil initializenetwork") EndProcedure Procedure StartSnapshot64() ; start backup/restore program ... - dummy=system(SYS$ + "\windows\system32\cmd.exe /C start /D "+SYS$+"\ "+SYS$+"\snapshot64.exe") + dummy=system(SYS$ + "\windows\system32\cmd.exe /C start /D " + SYS$ + "\ " + SYS$ + "\snapshot64.exe") EndProcedure