From bbae21eb36ebc9b84a45731efdbd3d3562dcebd3 Mon Sep 17 00:00:00 2001 From: "Michael H.G. Schmidt" Date: Fri, 23 Feb 2024 19:20:44 +0100 Subject: [PATCH 1/5] . --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 6083d41..ede6a2f 100644 --- a/.gitignore +++ b/.gitignore @@ -10,4 +10,5 @@ distribution SOFTWAREBKP tmp/ temp/ +custom/ From 6d1161a4f2cb8bdac81f80c704770165399540ee Mon Sep 17 00:00:00 2001 From: "Michael H.G. Schmidt" Date: Fri, 23 Feb 2024 21:45:13 +0100 Subject: [PATCH 2/5] blocked an update --- tools/block-updates.cmd | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/tools/block-updates.cmd b/tools/block-updates.cmd index 761b251..aa92071 100644 --- a/tools/block-updates.cmd +++ b/tools/block-updates.cmd @@ -28,6 +28,11 @@ echo [ Feature Update to Windows 10 Version 21H2 x64 ] powershell -command "Hide-WindowsUpdate -KBArticleID KB5034122 -AcceptAll" echo. +echo blocking UPDATE KB5034763 ... +echo [ Cumulative Update for Windows 10 Version 21H2 x64 ] +powershell -command "Hide-WindowsUpdate -KBArticleID KB5034763 -AcceptAll" +echo. + echo blocking a hardware driver ... echo [ Advanced Micro Devices ] powershell -command "Hide-WindowsUpdate -KBArticleID 'Advanced Micro Devices, Inc. - Display - 31.0.12027.7000' -AcceptAll" From b0672779459dfdb77f73ffbea1507dd1814c4534 Mon Sep 17 00:00:00 2001 From: "Michael H.G. Schmidt" Date: Sat, 24 Feb 2024 16:53:31 +0100 Subject: [PATCH 3/5] bugfix and relocation --- {scripts => optional}/config/snapcontrol.ini | 10 ++++--- optional/install-snapcontrol.cmd | 27 ++++++++++++------- optional/startmenu/Drive Snapshot.lnk | Bin 0 -> 1183 bytes scripts/startmenu/Drive Snapshot.lnk | Bin 973 -> 0 bytes 4 files changed, 24 insertions(+), 13 deletions(-) rename {scripts => optional}/config/snapcontrol.ini (84%) create mode 100644 optional/startmenu/Drive Snapshot.lnk delete mode 100644 scripts/startmenu/Drive Snapshot.lnk diff --git a/scripts/config/snapcontrol.ini b/optional/config/snapcontrol.ini similarity index 84% rename from scripts/config/snapcontrol.ini rename to optional/config/snapcontrol.ini index 778e9df..373b8ac 100644 --- a/scripts/config/snapcontrol.ini +++ b/optional/config/snapcontrol.ini @@ -1,12 +1,12 @@ ; SNAPCONTROL config file. -; https://gitea.exabyte-systems.com/WINDOWS/snapcontrol +; https://gitea.exabyte-systems.com/WINDOWS/snapcontrol.git ; ; This tool creates an image backups of windows machines, ; it uses the Drive Snapshot tool by Tom Ehlert Software. ; Please support this great tool and buy a license. ; http://www.drivesnapshot.de/en/order.htm ; -; Copyright (c) 2019-2021 Michael H.G. Schmidt +; Copyright (c) 2019-2024 Michael H.G. Schmidt ; EMAIL: michael@schmidt2.de ; Released under the MIT license. ; @@ -14,7 +14,8 @@ ; [BACKUP] -; path where snapshot.exe and cmail.exe is located ... +; path where cmail.exe is located ... +; (snaphot64.exe, this inifile and snapcontrol.exe must be always located in %WINDIR%!) BinPath = c:\tools ; target PATH examples: @@ -80,6 +81,9 @@ EjectMedia = yes ; should we ask for a shutdown after backup ? (yes/no) AskForShutdown = yes +; should we force a shutdown after the backup run? +; user will NOT be asked for consent! (useful for schedule mode "TIME" and silent mode) +ForcedShutdown = no [LOGGING] diff --git a/optional/install-snapcontrol.cmd b/optional/install-snapcontrol.cmd index 976fdc7..6244719 100644 --- a/optional/install-snapcontrol.cmd +++ b/optional/install-snapcontrol.cmd @@ -3,40 +3,47 @@ call check-for-admin if %ERRORLEVEL% neq 0 exit /b set TOOLS=%SystemDrive%\tools -set INIFILE=..\scripts\config\snapcontrol.ini +set INIFILE=config\snapcontrol.ini set SOFTWARE=..\software +set STARTMENU="%PROGRAMDATA%\Microsoft\Windows\Start Menu\Programs\tools" + +if NOT EXIST %SOFTWARE%\snapcontrol.exe ( + echo ERROR: %SOFTWARE%\snapcontrol.exe not found! + exit /b +) echo ####### %0 ####### +echo killing snapcontrol processes... +taskkill /F /IM snapcontrol.exe 2>nul + +echo killing snapshot processes... +taskkill /F /IM snapshot64.exe 2>nul + echo copy snapcontrol binary to [ %windir% ] ... copy /Y %SOFTWARE%\snapcontrol.exe %windir% 2>nul if EXIST %SOFTWARE%\snapshot64_licensed.exe ( - echo copying LICENSED snapshot64 to %windir% ... copy /Y %SOFTWARE%\snapshot64_licensed.exe %windir%\snapshot64.exe - ) else ( - echo copying STANDARD snapshot64 to boot image ... - copy /Y %SOFTWARE%\snapshot64.exe %windiw% - + copy /Y %SOFTWARE%\snapshot64.exe %windir% ) if NOT EXIST %windir%\snapcontrol.ini ( - echo copying STANDARD inifile to %windir% ... copy /Y %INIFILE% %windir% - ) else ( - echo inifile already copied. nothing to do! - ) echo creating scheduler task ... %windir%\snapcontrol /I +echo copy startmenu link ... +copy /Y "startmenu\Drive Snapshot.lnk" %STARTMENU% + echo ####### %0 ####### pause diff --git a/optional/startmenu/Drive Snapshot.lnk b/optional/startmenu/Drive Snapshot.lnk new file mode 100644 index 0000000000000000000000000000000000000000..ac9af82fd0d40a18e3b889549e75d11ac84279c7 GIT binary patch literal 1183 zcmaJ=T}YEr7=C72{?Ti`ds@pVJ0{Hh&h0lNR}1EKuD1Be%hqb_uJGa;W<3-`=0l_=Q-~==RNfR47o{^ zz?3dgdk3j7(e{6unYFji8OG*E=F6yOGRLF+ZF2_mm#uoFAr`+TqsT>3<458qpD zc>irG4q2^tcj2(p;av+_H%`N*4>V1^U_?`Az!!{!QHeApBRYB29dXHw!k8g_r;Xd$ z-uIyioe02(AR-7eG7nuSfh5?Z{kdg=r=hCR6G! zrhLvLUjQu#QFoBP2X?4X;72b3>?YiCEetYN326;PKCy*3VXa;wmcM&(e;Xq3$ z+!5@ttBSvuoJFKp;7yQ;2lQ^5R63k+aD61`cG%!^0C2` z_7556m3=bTOfczTjapjR?+diV%>T-pulvpyzgo;5zkF)(-1oxejX@jdEiAM&@*iiQ z&C}@lVSP5|M1S4r@9CV8aNAxB{XQWnBC?3YLY~8epK&edW@AmD|?APU#_oEQBF@OyGm`N z6gC@eyKKTXK}aIjrTveibp^%;OG(WG_r8ruiKk0|B(j6pysChm@i=}2wuLiqjw4GX~T>Zo{mZz1ZA9l5xD~4vWCuT9_ zewRPZuYx@iAW0VxvARlpjLmCNR)e=1+u%`NclG#P6ol%0B z9juZOq8?7ZWDsGH4|w2zLE)8Erof^b91Pk926H7D^qs9@;EE8800u)aCpYNs1_6eW z{QR6^1{(%W1{Q|*`!s{ZH{=FA*`)_mQ36&~kI)Ea83jlIW%7YAhoKlKBEpcxV8j4& zT1HUlMg@joKgWPzk2*s=*9cbz20y5|T0v_wbAxVg0Gazh2xO2Mh(H4K(|-fa%VS7n zC;-wKK=Vt0YD^gP7*ZK3fS7?n28ey2G$;r_d}AO60dF7{2V!O**80|JCjg|w@^eaa zQyGAP0QO@{ab99UaYlZLnTcL%1<*iQpxJs1F(@R$XEAtP!@=OpU^f#F9{@z(P@7WmI{o%H#lxC6_2M&?rwn_mky1sKdxUd2~HNPY&; z%bdWp0Sr_I!{C76w+4G}IWu&+FaL2tcu8@Zk|t0bY?(Ze!41R+rztRKfSn6c0s$L= z6vz;RkE+|>yGscy{m7KiGw<~pP{QB>DFGS655)Lmgn>a6s*b?{$Y6*M0H<4!APz2S6iB86#XuVPfEa8XEZKwju|N!R@UpCA4cn=g z1h-yeIN*O%;({YkTn?lFWU2%Zqelz=XawnGV6X&Ykl`D}a$VN;7I-Z8aL`*~ThSv6 g6wd%D@BrfH{aa((o~(D<6?EsIzUsf@AaNJ~0PHEoga7~l From 0c6722cdb17e296651851f4204b324844c5f0244 Mon Sep 17 00:00:00 2001 From: "Michael H.G. Schmidt" Date: Sat, 24 Feb 2024 16:55:19 +0100 Subject: [PATCH 4/5] bugfix --- 06_Copy2Media.cmd | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/06_Copy2Media.cmd b/06_Copy2Media.cmd index bce5f92..57da1a8 100644 --- a/06_Copy2Media.cmd +++ b/06_Copy2Media.cmd @@ -77,6 +77,10 @@ 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%\ @@ -106,10 +110,6 @@ if EXIST %DRIVE%\tools\%SNAPCONTROL_INI% ( tools\searchreplace %DRIVE%\tools\%SNAPCONTROL_INI% "^.*MAILPASS.*=.*" "MailPass = DELETED" ) -echo. -echo deleting ftpsettings.cmd ... -del /F /Q %DRIVE%\tools\custom\ftpsettings.cmd - echo. echo ====== echo READY. From 326d11f18b15b38bd67ec896b39dbb792d6c24d5 Mon Sep 17 00:00:00 2001 From: "Michael H.G. Schmidt" Date: Sun, 25 Feb 2024 10:50:33 +0100 Subject: [PATCH 5/5] bugfix --- optional/install-seafile.cmd | 2 +- optional/install-softmaker-2024.cmd | 2 +- optional/install-softmaker.cmd | 2 +- tools/adjoin.cmd | 2 +- tools/personalfiles.cmd | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/optional/install-seafile.cmd b/optional/install-seafile.cmd index d810d20..e8268f4 100644 --- a/optional/install-seafile.cmd +++ b/optional/install-seafile.cmd @@ -5,7 +5,7 @@ if %ERRORLEVEL% neq 0 exit /b set OPT=..\optional set SOFTWARE=..\software set MSI=seafile-setup.msi -set CUSTOM_SETTINGS=..\customsettings.cmd +set CUSTOM_SETTINGS=..\custom\settings.cmd set seafile_server_url=0 set STARTMENU="%PROGRAMDATA%\Microsoft\Windows\Start Menu\Programs" diff --git a/optional/install-softmaker-2024.cmd b/optional/install-softmaker-2024.cmd index f636765..92c43d4 100644 --- a/optional/install-softmaker-2024.cmd +++ b/optional/install-softmaker-2024.cmd @@ -5,7 +5,7 @@ if %ERRORLEVEL% neq 0 exit /b set OPT=..\optional set SOFTWARE=..\software set MSI=softmaker-setup-2024.msi -set CUSTOM_SETTINGS=..\customsettings.cmd +set CUSTOM_SETTINGS=..\custom\settings.cmd set softmaker_license=0 set STARTMENU="%PROGRAMDATA%\Microsoft\Windows\Start Menu\Programs" diff --git a/optional/install-softmaker.cmd b/optional/install-softmaker.cmd index 6f9ae40..a5a3bb6 100644 --- a/optional/install-softmaker.cmd +++ b/optional/install-softmaker.cmd @@ -5,7 +5,7 @@ if %ERRORLEVEL% neq 0 exit /b set OPT=..\optional set SOFTWARE=..\software set MSI=softmaker-setup.msi -set CUSTOM_SETTINGS=..\customsettings.cmd +set CUSTOM_SETTINGS=..\custom\settings.cmd set softmaker_license=0 set STARTMENU="%PROGRAMDATA%\Microsoft\Windows\Start Menu\Programs" diff --git a/tools/adjoin.cmd b/tools/adjoin.cmd index 4e26445..43c7f44 100644 --- a/tools/adjoin.cmd +++ b/tools/adjoin.cmd @@ -4,7 +4,7 @@ if %ERRORLEVEL% neq 0 exit /b set TOOLS=c:\tools set SCRIPT_SETTINGS=%TOOLS%\scripts\settings.cmd -set CUSTOM_SETTINGS=%TOOLS%\customsettings.cmd +set CUSTOM_SETTINGS=%TOOLS%\custom\settings.cmd echo ####### %0 ####### diff --git a/tools/personalfiles.cmd b/tools/personalfiles.cmd index 0b6dc1f..15e6075 100644 --- a/tools/personalfiles.cmd +++ b/tools/personalfiles.cmd @@ -6,7 +6,7 @@ rem =================== set TOOLS=c:\tools set SCRIPT_SETTINGS=%TOOLS%\scripts\settings.cmd -set CUSTOM_SETTINGS=%TOOLS%\customsettings.cmd +set CUSTOM_SETTINGS=%TOOLS%\custom\settings.cmd set PERSONALFILES_DONE=%LOCALAPPDATA%\.personalfiles_done set GITWORKDIR=%USERPROFILE%\workspace set gitrepo=undefined