automated process of custom image creation

2021-03-16 23:23:06 +01:00 · 2021-03-16 23:23:06 +01:00 · 98fdb8ee59
commit 98fdb8ee59
parent 151eb48a75
15 changed files with 184 additions and 255 deletions
--- a/source/allpull.pb
+++ b/source/allpull.pb
@ -97,9 +97,9 @@ EndProcedure

 allpull(ProgramParameter(0))
 CloseConsole()
-; IDE Options = PureBasic 5.62 (Windows - x64)
+; IDE Options = PureBasic 5.73 LTS (Windows - x64)
 ; ExecutableFormat = Console
-; CursorPosition = 16
+; CursorPosition = 18
 ; Folding = -
 ; Executable = C:\TEMP\allpull.exe
 ; DisableDebugger
--- a/source/installwarning.pb
+++ b/source/installwarning.pb
@ -0,0 +1,53 @@
+; installwarning.pb
+; ------------------------------------------------------------
+; shows a warning when starting the install process 
+; LICENSE  : GPL
+; AUTHOR   : Michael H.G. Schmidt
+; EMAIL    : michael@schmidt2.de
+; DATE     : 20210315
+; ------------------------------------------------------------
+;
+
+dummy$ = ""
+
+; preparations to use native "system" command...
+ImportC "msvcrt.lib"
+  system(str.p-ascii)
+EndImport
+
+Result = MessageRequester("+++ Windows 10 unattended Installation +++",
+                          "This will install a new OS (unattended)" + Chr(13) +
+                          "and it will DELETE all DATA an your [ C: ] Drive!",
+                          #PB_MessageRequester_YesNo | #PB_MessageRequester_Info)
+
+If Result = #PB_MessageRequester_Yes
+  
+  Result = MessageRequester("Caution !",
+                            "LAST WARNING:" + Chr(13) + 
+                            "REALLY DELETE ALL Data on DRIVE [ C: ] ?",
+                            #PB_MessageRequester_YesNo | #PB_MessageRequester_Warning)
+  
+  ; start installation ...
+  If Result = #PB_MessageRequester_Yes
+    dummy=system("x:\winsetup.exe")
+    End 0
+  EndIf
+
+EndIf
+
+; show abort message ...
+OpenWindow(0, 0, 0, 270, 70, "Installation ABORTED",
+           #PB_Window_SystemMenu | #PB_Window_ScreenCentered)
+
+If LoadFont(0, "System", 10)
+  SetGadgetFont(#PB_Default, FontID(0))
+EndIf
+
+TextGadget(0, 0, 20, 270, 30, "Please POWEROFF your system now!", #PB_Text_Center)
+
+; wait forever (window cannot be closed by user) ...
+Repeat : Until WaitWindowEvent() = True
+
+; IDE Options = PureBasic 5.73 LTS (Windows - x64)
+; CursorPosition = 32
+; EnableXP
--- a/source/setbgcol.pb
+++ b/source/setbgcol.pb
@ -4,7 +4,7 @@
 ; LICENSE  : GPL
 ; AUTHOR   : Michael H.G. Schmidt
 ; EMAIL    : michael@schmidt2.de
-; DATE     : 20190524
+; DATE     : 20210315
 ; ------------------------------------------------------------
 ;

@ -40,5 +40,5 @@ SetSysColors_(1,@lpaElements(),@lpaRgbValues(0))
 CloseConsole()

 ; IDE Options = PureBasic 5.73 LTS (Windows - x64)
-; CursorPosition = 35
+; CursorPosition = 6
 ; EnableXP
--- a/wim/.gitignore
+++ b/wim/.gitignore
@ -5,3 +5,5 @@
 *.dll
 *.txt
 *.BAK
+!installwarning.exe
+
--- a/wim/export-image.cmd
+++ b/wim/export-image.cmd
@ -1,10 +1,16 @@
@echo off
 set SOURCES=c:\TEMP\W10\sources

+if NOT EXIST %SOURCES%\install.esd (
+  echo.
+  echo [%0] ERROR: %SOURCES%\install.esd NOT found!
+  exit /b
+)
+
 echo deleting old install.wim ...
 del %SOURCES%\install.wim 1>nul 2>nul

-echo exporting WIM image from %SOURCES%\install.esd ...
+echo exporting image from %SOURCES%\install.esd ...
 dism /Export-Image ^
  /SourceImageFile:%SOURCES%\install.esd ^
  /DestinationImageFile:%SOURCES%\install.wim ^
--- a/wim/finish-boot.cmd
+++ b/wim/finish-boot.cmd
@ -0,0 +1,18 @@
+@echo off
+set SOURCES=c:\TEMP\W10\sources
+set BOOT=c:\TEMP\BOOT
+
+echo renaming Windows setup.exe ...
+if NOT EXIST %BOOT%\winsetup.exe (
+  move /Y %BOOT%\setup.exe %BOOT%\winsetup.exe
+)
+
+echo copy install utility to boot ...
+copy /Y installwarning.exe %BOOT%\setup.exe
+
+echo unmounting and committing changes to %SOURCES%\boot.wim ...
+dism /Unmount-Wim /MountDir:%BOOT% /Commit
+
+echo directory of %BOOT% :
+dir %BOOT%
+
--- a/wim/finish-image.cmd
+++ b/wim/finish-image.cmd
@ -1,28 +1,34 @@
@echo off
 set SOURCES=c:\TEMP\W10\sources
-set MNT=c:\TEMP\WIM
+set IMAGE=c:\TEMP\IMAGE

-rd /S /Q %MNT%\Windows\Setup\scripts 1>nul 2>nul
-mkdir %MNT%\Windows\Setup\scripts 1>nul 2>nul
+if NOT EXIST %SOURCES%\install.wim (
+  echo.
+  echo [%0] ERROR: %SOURCES%\install.wim NOT found!
+  exit /b
+)

-echo copying scripts to %MNT%\Windows\Setup\scripts ...
-copy /Y SetupComplete.cmd %MNT%\Windows\Setup\scripts
+rd /S /Q %IMAGE%\Windows\Setup\scripts 1>nul 2>nul
+mkdir %IMAGE%\Windows\Setup\scripts 1>nul 2>nul
+
+echo copying scripts to %IMAGE%\Windows\Setup\scripts ...
+copy /Y SetupComplete.cmd %IMAGE%\Windows\Setup\scripts
 if %errorlevel% neq 0 exit /b %errorlevel%

-copy /Y StartCustomSetup.cmd %MNT%\Windows\Setup\scripts
+copy /Y StartCustomSetup.cmd %IMAGE%\Windows\Setup\scripts
 if %errorlevel% neq 0 exit /b %errorlevel%

 echo showing directory contents :
-dir %MNT%\Windows\Setup\scripts
+dir %IMAGE%\Windows\Setup\scripts

-echo doing cleanup on mountpoint %MNT% ...
-dism /Image:%MNT% /Cleanup-Image /StartComponentCleanup /ResetBase
+echo doing cleanup on mountpoint %IMAGE% ...
+dism /Image:%IMAGE% /Cleanup-Image /StartComponentCleanup /ResetBase

 echo unmounting and committing changes to %SOURCES%\install.wim ...
-dism /Unmount-Wim /MountDir:%MNT% /Commit
+dism /Unmount-Wim /MountDir:%IMAGE% /Commit

-echo directory of %MNT% :
-dir %MNT%
+echo directory of %IMAGE% :
+dir %IMAGE%

 echo exporting %SOURCES%\install.wim to %SOURCES%\install_FINAL.esd ...
 dism /Export-Image ^
--- a/wim/installwarning.exe
+++ b/wim/installwarning.exe
--- a/wim/make-all.cmd
+++ b/wim/make-all.cmd
@ -0,0 +1,36 @@
+@echo off
+clear
+
+echo =====
+echo START
+echo =====
+date /t
+time /t
+echo.
+
+for %%S in (
+
+  mount-boot.cmd
+  finish-boot.cmd
+
+  export-image.cmd
+  mount-image.cmd
+  remove-apps.cmd
+  remove-packages.cmd
+  finish-image.cmd
+
+) do (
+
+  echo ########## calling [ %%S ] ##########
+  call %%S
+  echo.
+
+)
+
+echo.
+date /t
+time /t
+echo =====
+echo END
+echo =====
+
--- a/wim/mount-boot.cmd
+++ b/wim/mount-boot.cmd
@ -0,0 +1,13 @@
+@echo off
+set SOURCES=c:\TEMP\W10\sources
+set BOOT=c:\TEMP\BOOT
+
+echo creating wim mountpoint for BOOT ...
+mkdir %BOOT% 1>nul 2>nul
+
+echo set write access for boot.wim ..
+attrib -R %SOURCES%\boot.wim
+
+echo mounting boot.wim to %BOOT% ...
+dism /Mount-Wim /WimFile:%SOURCES%\boot.wim /Name:"Microsoft Windows Setup (x64)" /MountDir:%BOOT%
+
--- a/wim/mount-image.cmd
+++ b/wim/mount-image.cmd
@ -1,10 +1,10 @@
@echo off
 set SOURCES=c:\TEMP\W10\sources
-set MNT=c:\TEMP\WIM
+set IMAGE=c:\TEMP\IMAGE

-echo creating wim mountpoint ...
-mkdir %MNT% 1>nul 2>nul
+echo creating image mountpoint ...
+mkdir %IMAGE% 1>nul 2>nul

-echo mounting install.wim to %MNT% ...
-dism /Mount-Wim /WimFile:%SOURCES%\install.wim /Name:"Windows 10 Pro" /MountDir:%MNT%
+echo mounting install.IMAGE to %IMAGE% ...
+dism /Mount-IMAGE /IMAGEFile:%SOURCES%\install.wim /Name:"Windows 10 Pro" /MountDir:%IMAGE%

--- a/wim/remove-apps.cmd
+++ b/wim/remove-apps.cmd
@ -1,53 +1,18 @@
@echo off
-set MNT=c:\TEMP\WIM
+set IMAGE=c:\TEMP\IMAGE

 echo exporting APPS list BEFORE doing any changes ...
-dism /Image:%MNT% /Get-ProvisionedAppxPackages 1>Apps-BEFORE.txt
+dism /Image:%IMAGE% /Get-ProvisionedAppxPackages 1>Apps-BEFORE.txt

-@echo on
+FOR /F %%P in (apps-to-remove.txt) do (

-dism /Image:%MNT% /Remove-ProvisionedAppxPackage /PackageName:Microsoft.549981C3F5F10_1.1911.21713.0_neutral_~_8wekyb3d8bbwe
-dism /Image:%MNT% /Remove-ProvisionedAppxPackage /PackageName:Microsoft.BingWeather_4.25.20211.0_neutral_~_8wekyb3d8bbwe
-dism /Image:%MNT% /Remove-ProvisionedAppxPackage /PackageName:Microsoft.DesktopAppInstaller_2019.125.2243.0_neutral_~_8wekyb3d8bbwe
-dism /Image:%MNT% /Remove-ProvisionedAppxPackage /PackageName:Microsoft.GetHelp_10.1706.13331.0_neutral_~_8wekyb3d8bbwe
-dism /Image:%MNT% /Remove-ProvisionedAppxPackage /PackageName:Microsoft.Getstarted_8.2.22942.0_neutral_~_8wekyb3d8bbwe
-dism /Image:%MNT% /Remove-ProvisionedAppxPackage /PackageName:Microsoft.HEIFImageExtension_1.0.22742.0_x64__8wekyb3d8bbwe
-dism /Image:%MNT% /Remove-ProvisionedAppxPackage /PackageName:Microsoft.Microsoft3DViewer_6.1908.2042.0_neutral_~_8wekyb3d8bbwe
-dism /Image:%MNT% /Remove-ProvisionedAppxPackage /PackageName:Microsoft.MicrosoftEdge.Stable_84.0.522.52_neutral__8wekyb3d8bbwe
-dism /Image:%MNT% /Remove-ProvisionedAppxPackage /PackageName:Microsoft.MicrosoftOfficeHub_18.1903.1152.0_neutral_~_8wekyb3d8bbwe
-dism /Image:%MNT% /Remove-ProvisionedAppxPackage /PackageName:Microsoft.MicrosoftSolitaireCollection_4.4.8204.0_neutral_~_8wekyb3d8bbwe
-dism /Image:%MNT% /Remove-ProvisionedAppxPackage /PackageName:Microsoft.MicrosoftStickyNotes_3.6.73.0_neutral_~_8wekyb3d8bbwe
-dism /Image:%MNT% /Remove-ProvisionedAppxPackage /PackageName:Microsoft.MixedReality.Portal_2000.19081.1301.0_neutral_~_8wekyb3d8bbwe
-dism /Image:%MNT% /Remove-ProvisionedAppxPackage /PackageName:Microsoft.MSPaint_2019.729.2301.0_neutral_~_8wekyb3d8bbwe
-dism /Image:%MNT% /Remove-ProvisionedAppxPackage /PackageName:Microsoft.Office.OneNote_16001.12026.20112.0_neutral_~_8wekyb3d8bbwe
-dism /Image:%MNT% /Remove-ProvisionedAppxPackage /PackageName:Microsoft.People_2019.305.632.0_neutral_~_8wekyb3d8bbwe
-dism /Image:%MNT% /Remove-ProvisionedAppxPackage /PackageName:Microsoft.ScreenSketch_2019.904.1644.0_neutral_~_8wekyb3d8bbwe
-dism /Image:%MNT% /Remove-ProvisionedAppxPackage /PackageName:Microsoft.SkypeApp_14.53.77.0_neutral_~_kzf8qxf38zg5c
-dism /Image:%MNT% /Remove-ProvisionedAppxPackage /PackageName:Microsoft.VP9VideoExtensions_1.0.22681.0_x64__8wekyb3d8bbwe
-dism /Image:%MNT% /Remove-ProvisionedAppxPackage /PackageName:Microsoft.Wallet_2.4.18324.0_neutral_~_8wekyb3d8bbwe
-dism /Image:%MNT% /Remove-ProvisionedAppxPackage /PackageName:Microsoft.WebMediaExtensions_1.0.20875.0_neutral_~_8wekyb3d8bbwe
-dism /Image:%MNT% /Remove-ProvisionedAppxPackage /PackageName:Microsoft.WebpImageExtension_1.0.22753.0_x64__8wekyb3d8bbwe
-dism /Image:%MNT% /Remove-ProvisionedAppxPackage /PackageName:Microsoft.Windows.Photos_2019.19071.12548.0_neutral_~_8wekyb3d8bbwe
-dism /Image:%MNT% /Remove-ProvisionedAppxPackage /PackageName:Microsoft.WindowsAlarms_2019.807.41.0_neutral_~_8wekyb3d8bbwe
-dism /Image:%MNT% /Remove-ProvisionedAppxPackage /PackageName:Microsoft.WindowsCamera_2018.826.98.0_neutral_~_8wekyb3d8bbwe
-dism /Image:%MNT% /Remove-ProvisionedAppxPackage /PackageName:microsoft.windowscommunicationsapps_16005.11629.20316.0_neutral_~_8wekyb3d8bbwe
-dism /Image:%MNT% /Remove-ProvisionedAppxPackage /PackageName:Microsoft.WindowsFeedbackHub_2019.1111.2029.0_neutral_~_8wekyb3d8bbwe
-dism /Image:%MNT% /Remove-ProvisionedAppxPackage /PackageName:Microsoft.WindowsMaps_2019.716.2316.0_neutral_~_8wekyb3d8bbwe
-dism /Image:%MNT% /Remove-ProvisionedAppxPackage /PackageName:Microsoft.WindowsSoundRecorder_2019.716.2313.0_neutral_~_8wekyb3d8bbwe
-dism /Image:%MNT% /Remove-ProvisionedAppxPackage /PackageName:Microsoft.Xbox.TCUI_1.23.28002.0_neutral_~_8wekyb3d8bbwe
-dism /Image:%MNT% /Remove-ProvisionedAppxPackage /PackageName:Microsoft.XboxApp_48.49.31001.0_neutral_~_8wekyb3d8bbwe
-dism /Image:%MNT% /Remove-ProvisionedAppxPackage /PackageName:Microsoft.XboxGameOverlay_1.46.11001.0_neutral_~_8wekyb3d8bbwe
-dism /Image:%MNT% /Remove-ProvisionedAppxPackage /PackageName:Microsoft.XboxGamingOverlay_2.34.28001.0_neutral_~_8wekyb3d8bbwe
-dism /Image:%MNT% /Remove-ProvisionedAppxPackage /PackageName:Microsoft.XboxIdentityProvider_12.50.6001.0_neutral_~_8wekyb3d8bbwe
-dism /Image:%MNT% /Remove-ProvisionedAppxPackage /PackageName:Microsoft.XboxSpeechToTextOverlay_1.17.29001.0_neutral_~_8wekyb3d8bbwe
-dism /Image:%MNT% /Remove-ProvisionedAppxPackage /PackageName:Microsoft.YourPhone_2019.430.2026.0_neutral_~_8wekyb3d8bbwe
-dism /Image:%MNT% /Remove-ProvisionedAppxPackage /PackageName:Microsoft.ZuneMusic_2019.19071.19011.0_neutral_~_8wekyb3d8bbwe
-dism /Image:%MNT% /Remove-ProvisionedAppxPackage /PackageName:Microsoft.ZuneVideo_2019.19071.19011.0_neutral_~_8wekyb3d8bbwe
+  echo removing APPX package [ Microsoft.%%P ]
+  dism /Image:%IMAGE% /Remove-ProvisionedAppxPackage /PackageName:Microsoft.%%P

-@echo off
+)

 echo exporting remaining APPS list ...
-dism /Image:%MNT% /Get-ProvisionedAppxPackages 1>Apps-AFTER.txt
+dism /Image:%IMAGE% /Get-ProvisionedAppxPackages 1>Apps-AFTER.txt

 rem showing packages ...
 dir Apps*.txt
--- a/wim/remove-packages.cmd
+++ b/wim/remove-packages.cmd
@ -1,194 +1,21 @@
@echo off
-set MNT=c:\TEMP\WIM
+set IMAGE=c:\TEMP\IMAGE

 rem the CHECKFILE is a file that will be monitored against deletion ...
-set CHECKFILE=%MNT%\Windows\SysWOW64\mf.dll
+set CHECKFILE=%IMAGE%\Windows\SysWOW64\mf.dll

 echo exporting PACKAGE list BEFORE doing any changes ...
-install_wim_tweak /p %MNT% /l
+install_wim_tweak /p %IMAGE% /l
 move /Y Packages.txt Packages-BEFORE.txt

 rem ###################################
 rem MAIN loop ( remove packages ) ...
 rem ###################################

-for %%P in (
+FOR /F %%P in (packages-to-remove.txt) do (

-  Adobe-Flash
-  Containers-ApplicationGuard
-  Containers-Client
-  Containers-DisposableClientVM
-  Containers-Guest-Gated
-  Containers-OptionalFeature
-  Containers-Server
-  DeviceAccess
-  HyperV
-  LanguageFeatures-WordBreaking
-  Media-FaceAnalysis
-  Media-Ocr
-  Microsoft-Composable-PlatformExtension
-  Microsoft-Hyper-V
-  Microsoft-IoTUAP-ShellExt-Tools
-  Microsoft-Mobile
-  Microsoft-PPIProjection
-  Microsoft-UtilityVM
-  Microsoft-Windows-3DAudio
-  Microsoft-Windows-ApiSetSchemaExtension-HyperV
-  Microsoft-Windows-AppCompat
-  Microsoft-Windows-AppManagement
-  Microsoft-Windows-AppServerClient
-  Microsoft-Windows-Backup
-  Microsoft-Windows-Basic-Http-Minio
-  Microsoft-Windows-BioEnrollment
-  Microsoft-Windows-BITS
-  Microsoft-Windows-Branding-Enterprise
-  Microsoft-Windows-Browser
-  Microsoft-Windows-BusinessScanning
-  Microsoft-Windows-Casting
-  Microsoft-Windows-Client-AssignedAccess
-  Microsoft-Windows-Client-EmbeddedExp
-  Microsoft-Windows-Client-Optional-Features
-  Microsoft-Windows-Client-ShellLauncher
-  Microsoft-Windows-Common-Modem
-  Microsoft-Windows-COM-MSMQ
-  Microsoft-Windows-Compression
-  Microsoft-Windows-ContactSupport
-  Microsoft-Windows-ContentDeliveryManager
-  Microsoft-Windows-CoreSystem-DebugTransports
-  Microsoft-Windows-Cortana
-  Microsoft-Windows-DataCenterBridging
-  Microsoft-Windows-DeviceSync
-  Microsoft-Windows-DirectoryServices
-  Microsoft-Windows-EnterpriseClientSync
-  Microsoft-Windows-FodMetadata
-  Microsoft-Windows-Geolocation
-  Microsoft-Windows-Hello-Face
-  Microsoft-Windows-Help
-  Microsoft-Windows-HVSI-Components
-  Microsoft-Windows-HyperV-OptionalFeature-HypervisorPlatform
-  Microsoft-Windows-HyperV-OptionalFeature-VirtualMachinePlatform
-  Microsoft-Windows-Identity-Foundation
-  Microsoft-Windows-IIS-WebServer
-  Microsoft-Windows-International
-  Microsoft-Windows-InternetExplorer
-  Microsoft-Windows-Internet
-  Microsoft-Windows-Killbits
-  Microsoft-Windows-LanguageEnablingComponents
-  Microsoft-Windows-LanguageFeatures
-  Microsoft-Windows-Legacy
-  Microsoft-Windows-Links
-  Microsoft-Windows-Lxss
-  Microsoft-Windows-Management-SecureAssessment
-  Microsoft-Windows-Migration
-  Microsoft-Windows-MiracastView
-  Microsoft-Windows-MobileBroadband
-  Microsoft-Windows-MobileCore
-  Microsoft-Windows-MobilePC
-  Microsoft-Windows-MRT10
-  Microsoft-Windows-MSMQ
-  Microsoft-Windows-MultiPoint-Connector
-  Microsoft-Windows-Network-Connectivity-Assistant
-  Microsoft-Windows-NetworkDiagnostics
-  Microsoft-Windows-Network-QoS
-  Microsoft-Windows-NFS
-  Microsoft-Windows-Not-Supported-On-LTSB
-  Microsoft-Windows-OfflineFiles
-  Microsoft-Windows-OneCore-Containers
-  Microsoft-Windows-OneDrive
-  Microsoft-Windows-ParentalControls
-  Microsoft-Windows-PAW-Feature
-  Microsoft-Windows-PeerDist
-  Microsoft-Windows-PeerToPeer
-  Microsoft-Windows-PerformanceCounters
-  Microsoft-Windows-PhotoBasic
-  Microsoft-Windows-Portable-Devices
-  Microsoft-Windows-Printing-InternetPrinting-Client
-  Microsoft-Windows-Printing-LocalPrinting-Enterprise
-  Microsoft-Windows-Printing-PremiumTools
-  Microsoft-Windows-Printing-PrintToPDFServices
-  microsoft-windows-printing-wfs-fod-package-Wrapper
-  Microsoft-Windows-Printing-WFS-FoD-Package
-  Microsoft-Windows-Printing-XPSServices
-  Microsoft-Windows-Provisioning
-  Microsoft-Windows-Proximity
-  Microsoft-Windows-QuickAssist
-  Microsoft-Windows-RDC
-  Microsoft-Windows-RemoteAssistance
-  Microsoft-Windows-RemoteDesktop
-  Microsoft-Windows-RemoteFX
-  Microsoft-Windows-RetailDemo
-  Microsoft-Windows-Search2
-  Microsoft-Windows-SearchEngine
-  Microsoft-Windows-SenseClient
-  Microsoft-Windows-Serial
-  Microsoft-Windows-ShareMedia
-  Microsoft-Windows-Shell-HomeGroup
-  Microsoft-Windows-Shell-SettingSync
-  Microsoft-Windows-Skype
-  Microsoft-Windows-SMB1Client-D
-  Microsoft-Windows-SMB1Deprecation-Group
-  Microsoft-Windows-SMB1
-  Microsoft-Windows-SMB1Server-D-Opt
-  Microsoft-Windows-SmbDirect-Opt
-  Microsoft-Windows-SmbDirect
-  Microsoft-Windows-SnippingTool
-  Microsoft-Windows-SNMP
-  Microsoft-Windows-StorageService
-  Microsoft-Windows-Store
-  Microsoft-Windows-SystemRestore
-  Microsoft-Windows-TabletPC
-  Microsoft-Windows-TabletPCMath
-  microsoft-windows-tabletpcmath-package-Wrapper
-  Microsoft-Windows-TabShellExperience
-  Microsoft-Windows-TerminalServices
-  Microsoft-Windows-TextPrediction-Dictionaries
-  Microsoft-Windows-TextPrediction
-  Microsoft-Windows-TroubleShooting
-  Microsoft-Windows-TS
-  Microsoft-Windows-UpdateTargeting-ClientOS
-  Microsoft-Windows-UserExperience
-  microsoft-windows-userexperience-desktop-package-Wrapper
-  Microsoft-Windows-Virtualization-RemoteFX-User-Mode-Transport
-  Microsoft-Windows-Virtualization
-  Microsoft-Windows-VirtualPC
-  Microsoft-Windows-VirtualXP
-  Microsoft-Windows-WebcamExperience
-  Microsoft-Windows-WindowsFoundation-LanguagePack
-  Microsoft-Windows-WinOcr
-  Microsoft-Windows-WinRT
-  Microsoft-Windows-WinSATMediaFiles
-  Microsoft-Windows-WMIPerf
-  Microsoft-Windows-WordBreaking
-  Microsoft-Windows-WorkplaceJoin
-  Microsoft-Windows-WPD-LegacyWmdmFeature
-  Microsoft-Windows-WPD-UltimatePortableDeviceFeature-Feature
-  Microsoft-Windows-Xps
-  Microsoft-Xbox
-  MSMQ-Driver-Package
-  MultiPoint
-  Networking-MPSSVC-Rules-EnterpriseEdition-Package
-  OpenSSH-Client-Package
-  openssh-client-package-Wrapper
-  RemoteDesktopServices
-  Sensors-Universal
-  Server-Help
-  Windows-Defender
-  WindowsSearchEngineSKU-Group
-  Microsoft-OneCore-Multimedia-CastingCommon
-  Microsoft-OneCore-Multimedia-CastingReceiver
-  Microsoft-OneCore-Multimedia-CastingTransmitter
-  Microsoft-OneCore-DeviceUpdateCenter
-  Microsoft-OneCore-DirectX-Database
-  Microsoft-OneCore-IsolatedUserMode
-  Microsoft-Onecore-SPP-VirtualDevice
-  Microsoft-OneCore-VirtualizationBasedSecurity
-  Microsoft-Windows-WMPNetworkSharingService
-
-) do (
-  
-  @echo on
-  install_wim_tweak.exe /p %MNT% /c "%%P" /r /n
-  @echo off 
+  echo removing PACKAGE [ %%P ] ...
+  install_wim_tweak.exe /p %IMAGE% /c "%%P" /r /n

  rem we will exit here in case the checkfile was deleted by a package removal ...
  if NOT EXIST %CHECKFILE% (
@ -202,9 +29,9 @@ echo CLEANUP ...
 del /F SOFTWAREBKP 1>nul 2>nul

 echo exporting remaining PACKAGES list ...
-install_wim_tweak /p %MNT% /l
+install_wim_tweak /p %IMAGE% /l
 move /Y Packages.txt Packages-AFTER.txt

-rem showing packages ...
+rem showing package files ...
 dir Packages*.txt

--- a/wim/umount-all.cmd
+++ b/wim/umount-all.cmd
@ -0,0 +1,13 @@
+@echo off
+set IMAGE=c:\TEMP\IMAGE
+set BOOT=c:\TEMP\BOOT
+
+echo unmounting image and discarding changes ...
+dism /Unmount-Wim /MountDir:%IMAGE% /Discard
+
+echo unmounting boot and discarding changes ...
+dism /Unmount-Wim /MountDir:%BOOT% /Discard
+
+echo cleaning up ...
+dism /Cleanup-Wim 
+
--- a/wim/umount-image.cmd
+++ b/wim/umount-image.cmd
@ -1,10 +0,0 @@
-@echo off
-set SOURCES=c:\TEMP\W10\sources
-set MNT=c:\TEMP\WIM
-
-echo unmounting wim and discarding changes ...
-dism /Unmount-Wim /MountDir:%MNT% /Discard
-
-echo cleaning up ...
-dism /Cleanup-Wim 
-