From 06e6c429095b8962a7ba3d1f2307c77b967b1e05 Mon Sep 17 00:00:00 2001 From: "Michael H.G. Schmidt" <michael@schmidt2.de> Date: Thu, 14 Jan 2021 00:03:49 +0100 Subject: [PATCH] . --- CustomSetup.cmd | 13 +------ scripts/autoconfig-all.cmd | 11 +----- wim/.gitignore | 11 +++--- wim/finish-image.cmd | 75 +++++++++++++++++++------------------- wim/remove-components.cmd | 28 ++++++++------ 5 files changed, 63 insertions(+), 75 deletions(-) diff --git a/CustomSetup.cmd b/CustomSetup.cmd index e82fd8a..c727569 100644 --- a/CustomSetup.cmd +++ b/CustomSetup.cmd @@ -2,17 +2,10 @@ rem this script puts everything in place ... set TOOLS=c:\tools -set LOG=c:\CustomSetup.txt - set SCRIPTS=%TOOLS%\scripts set BATCH=%SCRIPTS%\autoconfig-all.cmd -if not "%1"=="STDOUT_TO_FILE" %0 STDOUT_TO_FILE %* 1>%LOG% 2>&1 -shift /1 - echo ####### %0 ####### -date /t -time /t echo. echo killing ssh agent ... @@ -57,11 +50,9 @@ del /F %TOOLS%\MediaCreationTool20H2.zip 1>nul 2>nul echo. echo starting %BATCH% ... -start /MIN cmd /C %BATCH% +call %BATCH% echo. -date /t -time /t echo ####### %0 ####### echo READY. - +echo. diff --git a/scripts/autoconfig-all.cmd b/scripts/autoconfig-all.cmd index b812f0f..f3a7443 100644 --- a/scripts/autoconfig-all.cmd +++ b/scripts/autoconfig-all.cmd @@ -4,15 +4,8 @@ rem this script is doing most of the work ... set T=c:\TEMP set TOOLS=c:\tools set SCRIPTS=%TOOLS%\scripts -set LOG=%SCRIPTS%\autoconfig-all.txt -if not "%1"=="STDOUT_TO_FILE" %0 STDOUT_TO_FILE %* 1>%LOG% 2>&1 -shift /1 - -echo. echo ####### %0 ####### -date /t -time /t echo. echo creating %T% ... @@ -139,8 +132,6 @@ echo rebooting ... shutdown -g -t 0 echo. -date /t -time /t echo ####### %0 ####### echo READY. - +echo. diff --git a/wim/.gitignore b/wim/.gitignore index 5988f97..f98b103 100644 --- a/wim/.gitignore +++ b/wim/.gitignore @@ -1,5 +1,6 @@ -*.swp -*.wim -*.iso -*.exe -*.dll +*.swp +*.wim +*.iso +*.exe +*.dll +Packages*.* diff --git a/wim/finish-image.cmd b/wim/finish-image.cmd index d814030..4a95c01 100644 --- a/wim/finish-image.cmd +++ b/wim/finish-image.cmd @@ -1,38 +1,37 @@ -@echo off -set SOURCES=c:\TEMP\W10\sources -set MNT=c:\TEMP\WIM - -rd /S /Q %MNT%\Windows\Setup\scripts 1>nul 2>nul -mkdir %MNT%\Windows\Setup\scripts 1>nul 2>nul - -echo copying SetupComplete script to mountpoint %MNT% ... -copy /Y SetupComplete.cmd %MNT%\Windows\Setup\scripts -if %errorlevel% neq 0 exit /b %errorlevel% - -echo copying script for custom setup to mountpoint %MNT% ... -copy /Y StartCustomSetup.cmd %MNT%\Windows\Setup\scripts -if %errorlevel% neq 0 exit /b %errorlevel% - -echo showing directory contents : -dir %MNT%\Windows\Setup\scripts - -echo doing cleanup on mountpoint %MNT% ... -dism /Image:%MNT% /Cleanup-Image /StartComponentCleanup /ResetBase - -echo unmounting and committing changes to %SOURCES%\install.wim ... -dism /Unmount-Wim /MountDir:%MNT% /Commit - -echo directory of %MNT% : -dir %MNT% - -echo exporting %SOURCES%\install.wim to %SOURCES%\install_FINAL.esd ... -dism /Export-Image ^ - /SourceImageFile:%SOURCES%\install.wim ^ - /DestinationImageFile:%SOURCES%\install_FINAL.esd ^ - /SourceName:"Windows 10 Pro" ^ - /Compress:Recovery ^ - /CheckIntegrity - -echo deleting old %SOURCES%\install.wim -del /F %SOURCES%\install.wim - +@echo off +set SOURCES=c:\TEMP\W10\sources +set MNT=c:\TEMP\WIM + +rd /S /Q %MNT%\Windows\Setup\scripts 1>nul 2>nul +mkdir %MNT%\Windows\Setup\scripts 1>nul 2>nul + +echo copying scripts to %MNT%\Windows\Setup\scripts ... +copy /Y SetupComplete.cmd %MNT%\Windows\Setup\scripts +if %errorlevel% neq 0 exit /b %errorlevel% + +copy /Y StartCustomSetup.cmd %MNT%\Windows\Setup\scripts +if %errorlevel% neq 0 exit /b %errorlevel% + +echo showing directory contents : +dir %MNT%\Windows\Setup\scripts + +echo doing cleanup on mountpoint %MNT% ... +dism /Image:%MNT% /Cleanup-Image /StartComponentCleanup /ResetBase + +echo unmounting and committing changes to %SOURCES%\install.wim ... +dism /Unmount-Wim /MountDir:%MNT% /Commit + +echo directory of %MNT% : +dir %MNT% + +echo exporting %SOURCES%\install.wim to %SOURCES%\install_FINAL.esd ... +dism /Export-Image ^ + /SourceImageFile:%SOURCES%\install.wim ^ + /DestinationImageFile:%SOURCES%\install_FINAL.esd ^ + /SourceName:"Windows 10 Pro" ^ + /Compress:Recovery ^ + /CheckIntegrity + +echo deleting old %SOURCES%\install.wim +del /F %SOURCES%\install.wim + diff --git a/wim/remove-components.cmd b/wim/remove-components.cmd index 036f67a..2a5c645 100644 --- a/wim/remove-components.cmd +++ b/wim/remove-components.cmd @@ -1,5 +1,9 @@ set MNT=c:\TEMP\WIM +echo exporting PACKAGE list BEFORE doing any changes ... +install_wim_tweak /p %MNT% /l +move /Y Packages.txt Packages-BEFORE.txt + install_wim_tweak.exe /p %MNT% /c "Adobe-Flash" /r /n install_wim_tweak.exe /p %MNT% /c "Containers-ApplicationGuard" /r /n install_wim_tweak.exe /p %MNT% /c "Containers-Client" /r /n @@ -15,7 +19,7 @@ install_wim_tweak.exe /p %MNT% /c "Media-Ocr" /r /n install_wim_tweak.exe /p %MNT% /c "Microsoft-Composable-PlatformExtension" /r /n install_wim_tweak.exe /p %MNT% /c "Microsoft-Hyper-V" /r /n install_wim_tweak.exe /p %MNT% /c "Microsoft-IoTUAP-ShellExt-Tools" /r /n -install_wim_tweak.exe /p %MNT% /c "Microsoft-Media-Foundation" /r /n +rem install_wim_tweak.exe /p %MNT% /c "Microsoft-Media-Foundation" /r /n install_wim_tweak.exe /p %MNT% /c "Microsoft-Mobile" /r /n install_wim_tweak.exe /p %MNT% /c "Microsoft-OneCore" /r /n install_wim_tweak.exe /p %MNT% /c "microsoft-onecore-applicationmodel-sync-desktop-fod-package-Wrapper" /r /n @@ -69,11 +73,10 @@ install_wim_tweak.exe /p %MNT% /c "Microsoft-Windows-Legacy" /r /n install_wim_tweak.exe /p %MNT% /c "Microsoft-Windows-Links" /r /n install_wim_tweak.exe /p %MNT% /c "Microsoft-Windows-Lxss" /r /n install_wim_tweak.exe /p %MNT% /c "Microsoft-Windows-Management-SecureAssessment" /r /n -install_wim_tweak.exe /p %MNT% /c "Microsoft-Windows-Media-Format" /r /n -install_wim_tweak.exe /p %MNT% /c "Microsoft-Windows-MediaPlayback-OC" /r /n +rem install_wim_tweak.exe /p %MNT% /c "Microsoft-Windows-Media-Format" /r /n +rem install_wim_tweak.exe /p %MNT% /c "Microsoft-Windows-MediaPlayback-OC" /r /n install_wim_tweak.exe /p %MNT% /c "Microsoft-Windows-MediaPlayer" /r /n -install_wim_tweak.exe /p %MNT% /c "Microsoft-Windows-MediaPlayer-Payload-Package" /r /n -install_wim_tweak.exe /p %MNT% /c "Microsoft-Windows-Media-Streaming" /r /n +rem install_wim_tweak.exe /p %MNT% /c "Microsoft-Windows-Media-Streaming" /r /n install_wim_tweak.exe /p %MNT% /c "Microsoft-Windows-Migration" /r /n install_wim_tweak.exe /p %MNT% /c "Microsoft-Windows-MiracastView" /r /n install_wim_tweak.exe /p %MNT% /c "Microsoft-Windows-MobileBroadband" /r /n @@ -169,9 +172,9 @@ install_wim_tweak.exe /p %MNT% /c "Microsoft-Windows-WPD-UltimatePortableDeviceF install_wim_tweak.exe /p %MNT% /c "Microsoft-Windows-Xps" /r /n install_wim_tweak.exe /p %MNT% /c "Microsoft-Xbox" /r /n install_wim_tweak.exe /p %MNT% /c "MSMQ-Driver-Package" /r /n -install_wim_tweak.exe /p %MNT% /c "Multimedia-MFCore" /r /n -install_wim_tweak.exe /p %MNT% /c "Multimedia-RestrictedCodecsCore" /r /n -install_wim_tweak.exe /p %MNT% /c "Multimedia-RestrictedCodecsDolby" /r /n +rem install_wim_tweak.exe /p %MNT% /c "Multimedia-MFCore" /r /n +rem install_wim_tweak.exe /p %MNT% /c "Multimedia-RestrictedCodecsCore" /r /n +rem install_wim_tweak.exe /p %MNT% /c "Multimedia-RestrictedCodecsDolby" /r /n install_wim_tweak.exe /p %MNT% /c "MultiPoint" /r /n install_wim_tweak.exe /p %MNT% /c "Networking-MPSSVC-Rules-EnterpriseEdition-Package" /r /n install_wim_tweak.exe /p %MNT% /c "OpenSSH-Client-Package" /r /n @@ -182,10 +185,13 @@ install_wim_tweak.exe /p %MNT% /c "Server-Help" /r /n install_wim_tweak.exe /p %MNT% /c "Windows-Defender" /r /n install_wim_tweak.exe /p %MNT% /c "WindowsSearchEngineSKU-Group" /r /n -rem CLEANUP: +echo CLEANUP ... del /F SOFTWAREBKP 1>nul 2>nul -rem export remaining PACKAGE names ... +echo exporting remaining PACKAGE names AFTER removing packages ... install_wim_tweak /p %MNT% /l -dir Packages.txt +move /Y Packages.txt Packages-AFTER.txt + +rem showing packages ... +dir Packages*.txt