feat: Remove entry from hosts file (#1456 )

fix: Use bridge name variable (#1455 )
feat: Use PID for Samba process (#1454 )
2025-10-26 19:05:49 +00:00 · 2025-10-06 13:45:14 +02:00 · 2025-10-06 13:44:05 +02:00 · 2025-10-06 13:22:28 +02:00
43 changed files with 61 additions and 273 deletions
--- a/assets/win10x64-enterprise-eval.xml
+++ b/assets/win10x64-enterprise-eval.xml
@ -415,16 +415,11 @@
        </SynchronousCommand>
        <SynchronousCommand wcm:action="add">
          <Order>21</Order>
-          <CommandLine>cmd /C echo 20.20.20.1     host.lan >> %WINDIR%\system32\drivers\etc\hosts</CommandLine>
-          <Description>Add entry in hosts file</Description>
-        </SynchronousCommand>
-        <SynchronousCommand wcm:action="add">
-          <Order>22</Order>
          <CommandLine>cmd /C mklink /d %userprofile%\Desktop\Shared \\host.lan\Data</CommandLine>
          <Description>Create desktop shortcut to shared folder</Description>
        </SynchronousCommand>
        <SynchronousCommand wcm:action="add">
-          <Order>23</Order>
+          <Order>22</Order>
          <CommandLine>cmd /C if exist "C:\OEM\install.bat" start "Install" "cmd /C C:\OEM\install.bat"</CommandLine>
          <Description>Execute custom script from the OEM folder if exists</Description>
        </SynchronousCommand>
--- a/assets/win10x64-enterprise.xml
+++ b/assets/win10x64-enterprise.xml
@ -418,16 +418,11 @@
        </SynchronousCommand>
        <SynchronousCommand wcm:action="add">
          <Order>21</Order>
-          <CommandLine>cmd /C echo 20.20.20.1     host.lan >> %WINDIR%\system32\drivers\etc\hosts</CommandLine>
-          <Description>Add entry in hosts file</Description>
-        </SynchronousCommand>
-        <SynchronousCommand wcm:action="add">
-          <Order>22</Order>
          <CommandLine>cmd /C mklink /d %userprofile%\Desktop\Shared \\host.lan\Data</CommandLine>
          <Description>Create desktop shortcut to shared folder</Description>
        </SynchronousCommand>
        <SynchronousCommand wcm:action="add">
-          <Order>23</Order>
+          <Order>22</Order>
          <CommandLine>cmd /C if exist "C:\OEM\install.bat" start "Install" "cmd /C C:\OEM\install.bat"</CommandLine>
          <Description>Execute custom script from the OEM folder if exists</Description>
        </SynchronousCommand>
--- a/assets/win10x64-iot.xml
+++ b/assets/win10x64-iot.xml
@ -424,16 +424,11 @@
        </SynchronousCommand>
        <SynchronousCommand wcm:action="add">
          <Order>21</Order>
-          <CommandLine>cmd /C echo 20.20.20.1     host.lan >> %WINDIR%\system32\drivers\etc\hosts</CommandLine>
-          <Description>Add entry in hosts file</Description>
-        </SynchronousCommand>
-        <SynchronousCommand wcm:action="add">
-          <Order>22</Order>
          <CommandLine>cmd /C mklink /d %userprofile%\Desktop\Shared \\host.lan\Data</CommandLine>
          <Description>Create desktop shortcut to shared folder</Description>
        </SynchronousCommand>
        <SynchronousCommand wcm:action="add">
-          <Order>23</Order>
+          <Order>22</Order>
          <CommandLine>cmd /C if exist "C:\OEM\install.bat" start "Install" "cmd /C C:\OEM\install.bat"</CommandLine>
          <Description>Execute custom script from the OEM folder if exists</Description>
        </SynchronousCommand>
--- a/assets/win10x64-ltsc.xml
+++ b/assets/win10x64-ltsc.xml
@ -421,16 +421,11 @@
        </SynchronousCommand>
        <SynchronousCommand wcm:action="add">
          <Order>21</Order>
-          <CommandLine>cmd /C echo 20.20.20.1     host.lan >> %WINDIR%\system32\drivers\etc\hosts</CommandLine>
-          <Description>Add entry in hosts file</Description>
-        </SynchronousCommand>
-        <SynchronousCommand wcm:action="add">
-          <Order>22</Order>
          <CommandLine>cmd /C mklink /d %userprofile%\Desktop\Shared \\host.lan\Data</CommandLine>
          <Description>Create desktop shortcut to shared folder</Description>
        </SynchronousCommand>
        <SynchronousCommand wcm:action="add">
-          <Order>23</Order>
+          <Order>22</Order>
          <CommandLine>cmd /C if exist "C:\OEM\install.bat" start "Install" "cmd /C C:\OEM\install.bat"</CommandLine>
          <Description>Execute custom script from the OEM folder if exists</Description>
        </SynchronousCommand>
--- a/assets/win10x64.xml
+++ b/assets/win10x64.xml
@ -418,16 +418,11 @@
        </SynchronousCommand>
        <SynchronousCommand wcm:action="add">
          <Order>21</Order>
-          <CommandLine>cmd /C echo 20.20.20.1     host.lan >> %WINDIR%\system32\drivers\etc\hosts</CommandLine>
-          <Description>Add entry in hosts file</Description>
-        </SynchronousCommand>
-        <SynchronousCommand wcm:action="add">
-          <Order>22</Order>
          <CommandLine>cmd /C mklink /d %userprofile%\Desktop\Shared \\host.lan\Data</CommandLine>
          <Description>Create desktop shortcut to shared folder</Description>
        </SynchronousCommand>
        <SynchronousCommand wcm:action="add">
-          <Order>23</Order>
+          <Order>22</Order>
          <CommandLine>cmd /C if exist "C:\OEM\install.bat" start "Install" "cmd /C C:\OEM\install.bat"</CommandLine>
          <Description>Execute custom script from the OEM folder if exists</Description>
        </SynchronousCommand>
--- a/assets/win11x64-enterprise-eval.xml
+++ b/assets/win11x64-enterprise-eval.xml
@ -453,16 +453,11 @@
        </SynchronousCommand>
        <SynchronousCommand wcm:action="add">
          <Order>24</Order>
-          <CommandLine>cmd /C echo 20.20.20.1     host.lan >> %WINDIR%\system32\drivers\etc\hosts</CommandLine>
-          <Description>Add entry in hosts file</Description>
-        </SynchronousCommand>
-        <SynchronousCommand wcm:action="add">
-          <Order>25</Order>
          <CommandLine>cmd /C mklink /d %userprofile%\Desktop\Shared \\host.lan\Data</CommandLine>
          <Description>Create desktop shortcut to shared folder</Description>
        </SynchronousCommand>
        <SynchronousCommand wcm:action="add">
-          <Order>26</Order>
+          <Order>25</Order>
          <CommandLine>cmd /C if exist "C:\OEM\install.bat" start "Install" "cmd /C C:\OEM\install.bat"</CommandLine>
          <Description>Execute custom script from the OEM folder if exists</Description>
        </SynchronousCommand>
--- a/assets/win11x64-enterprise.xml
+++ b/assets/win11x64-enterprise.xml
@ -456,16 +456,11 @@
        </SynchronousCommand>
        <SynchronousCommand wcm:action="add">
          <Order>24</Order>
-          <CommandLine>cmd /C echo 20.20.20.1     host.lan >> %WINDIR%\system32\drivers\etc\hosts</CommandLine>
-          <Description>Add entry in hosts file</Description>
-        </SynchronousCommand>
-        <SynchronousCommand wcm:action="add">
-          <Order>25</Order>
          <CommandLine>cmd /C mklink /d %userprofile%\Desktop\Shared \\host.lan\Data</CommandLine>
          <Description>Create desktop shortcut to shared folder</Description>
        </SynchronousCommand>
        <SynchronousCommand wcm:action="add">
-          <Order>26</Order>
+          <Order>25</Order>
          <CommandLine>cmd /C if exist "C:\OEM\install.bat" start "Install" "cmd /C C:\OEM\install.bat"</CommandLine>
          <Description>Execute custom script from the OEM folder if exists</Description>
        </SynchronousCommand>
--- a/assets/win11x64-iot.xml
+++ b/assets/win11x64-iot.xml
@ -456,16 +456,11 @@
        </SynchronousCommand>
        <SynchronousCommand wcm:action="add">
          <Order>24</Order>
-          <CommandLine>cmd /C echo 20.20.20.1     host.lan >> %WINDIR%\system32\drivers\etc\hosts</CommandLine>
-          <Description>Add entry in hosts file</Description>
-        </SynchronousCommand>
-        <SynchronousCommand wcm:action="add">
-          <Order>25</Order>
          <CommandLine>cmd /C mklink /d %userprofile%\Desktop\Shared \\host.lan\Data</CommandLine>
          <Description>Create desktop shortcut to shared folder</Description>
        </SynchronousCommand>
        <SynchronousCommand wcm:action="add">
-          <Order>26</Order>
+          <Order>25</Order>
          <CommandLine>cmd /C if exist "C:\OEM\install.bat" start "Install" "cmd /C C:\OEM\install.bat"</CommandLine>
          <Description>Execute custom script from the OEM folder if exists</Description>
        </SynchronousCommand>
--- a/assets/win11x64-ltsc.xml
+++ b/assets/win11x64-ltsc.xml
@ -456,16 +456,11 @@
        </SynchronousCommand>
        <SynchronousCommand wcm:action="add">
          <Order>24</Order>
-          <CommandLine>cmd /C echo 20.20.20.1     host.lan >> %WINDIR%\system32\drivers\etc\hosts</CommandLine>
-          <Description>Add entry in hosts file</Description>
-        </SynchronousCommand>
-        <SynchronousCommand wcm:action="add">
-          <Order>25</Order>
          <CommandLine>cmd /C mklink /d %userprofile%\Desktop\Shared \\host.lan\Data</CommandLine>
          <Description>Create desktop shortcut to shared folder</Description>
        </SynchronousCommand>
        <SynchronousCommand wcm:action="add">
-          <Order>26</Order>
+          <Order>25</Order>
          <CommandLine>cmd /C if exist "C:\OEM\install.bat" start "Install" "cmd /C C:\OEM\install.bat"</CommandLine>
          <Description>Execute custom script from the OEM folder if exists</Description>
        </SynchronousCommand>
--- a/assets/win11x64.xml
+++ b/assets/win11x64.xml
@ -456,16 +456,11 @@
        </SynchronousCommand>
        <SynchronousCommand wcm:action="add">
          <Order>24</Order>
-          <CommandLine>cmd /C echo 20.20.20.1     host.lan >> %WINDIR%\system32\drivers\etc\hosts</CommandLine>
-          <Description>Add entry in hosts file</Description>
-        </SynchronousCommand>
-        <SynchronousCommand wcm:action="add">
-          <Order>25</Order>
          <CommandLine>cmd /C mklink /d %userprofile%\Desktop\Shared \\host.lan\Data</CommandLine>
          <Description>Create desktop shortcut to shared folder</Description>
        </SynchronousCommand>
        <SynchronousCommand wcm:action="add">
-          <Order>26</Order>
+          <Order>25</Order>
          <CommandLine>cmd /C if exist "C:\OEM\install.bat" start "Install" "cmd /C C:\OEM\install.bat"</CommandLine>
          <Description>Execute custom script from the OEM folder if exists</Description>
        </SynchronousCommand>
--- a/assets/win2008r2-eval.xml
+++ b/assets/win2008r2-eval.xml
@ -285,16 +285,11 @@
        </SynchronousCommand>
        <SynchronousCommand wcm:action="add">
          <Order>19</Order>
-          <CommandLine>cmd /C echo 20.20.20.1     host.lan >> %WINDIR%\system32\drivers\etc\hosts</CommandLine>
-          <Description>Add entry in hosts file</Description>
-        </SynchronousCommand>
-        <SynchronousCommand wcm:action="add">
-          <Order>20</Order>
          <CommandLine>cmd /C mklink /d %userprofile%\Desktop\Shared \\host.lan\Data</CommandLine>
          <Description>Create desktop shortcut to shared folder</Description>
        </SynchronousCommand>        
        <SynchronousCommand wcm:action="add">
-          <Order>21</Order>
+          <Order>20</Order>
          <CommandLine>cmd /C if exist "C:\OEM\install.bat" start "Install" "cmd /C C:\OEM\install.bat"</CommandLine>
          <Description>Execute custom script from the OEM folder if exists</Description>
        </SynchronousCommand>
--- a/assets/win2008r2.xml
+++ b/assets/win2008r2.xml
@ -288,16 +288,11 @@
        </SynchronousCommand>
        <SynchronousCommand wcm:action="add">
          <Order>19</Order>
-          <CommandLine>cmd /C echo 20.20.20.1     host.lan >> %WINDIR%\system32\drivers\etc\hosts</CommandLine>
-          <Description>Add entry in hosts file</Description>
-        </SynchronousCommand>
-        <SynchronousCommand wcm:action="add">
-          <Order>20</Order>
          <CommandLine>cmd /C mklink /d %userprofile%\Desktop\Shared \\host.lan\Data</CommandLine>
          <Description>Create desktop shortcut to shared folder</Description>
        </SynchronousCommand>        
        <SynchronousCommand wcm:action="add">
-          <Order>21</Order>
+          <Order>20</Order>
          <CommandLine>cmd /C if exist "C:\OEM\install.bat" start "Install" "cmd /C C:\OEM\install.bat"</CommandLine>
          <Description>Execute custom script from the OEM folder if exists</Description>
        </SynchronousCommand>
--- a/assets/win2012r2-eval.xml
+++ b/assets/win2012r2-eval.xml
@ -303,16 +303,11 @@
        </SynchronousCommand>
        <SynchronousCommand wcm:action="add">
          <Order>16</Order>
-          <CommandLine>cmd /C echo 20.20.20.1     host.lan >> %WINDIR%\system32\drivers\etc\hosts</CommandLine>
-          <Description>Add entry in hosts file</Description>
-        </SynchronousCommand>
-        <SynchronousCommand wcm:action="add">
-          <Order>17</Order>
          <CommandLine>cmd /C mklink /d %userprofile%\Desktop\Shared \\host.lan\Data</CommandLine>
          <Description>Create desktop shortcut to shared folder</Description>
        </SynchronousCommand>        
        <SynchronousCommand wcm:action="add">
-          <Order>18</Order>
+          <Order>17</Order>
          <CommandLine>cmd /C if exist "C:\OEM\install.bat" start "Install" "cmd /C C:\OEM\install.bat"</CommandLine>
          <Description>Execute custom script from the OEM folder if exists</Description>
        </SynchronousCommand>
--- a/assets/win2012r2.xml
+++ b/assets/win2012r2.xml
@ -306,16 +306,11 @@
        </SynchronousCommand>
        <SynchronousCommand wcm:action="add">
          <Order>16</Order>
-          <CommandLine>cmd /C echo 20.20.20.1     host.lan >> %WINDIR%\system32\drivers\etc\hosts</CommandLine>
-          <Description>Add entry in hosts file</Description>
-        </SynchronousCommand>
-        <SynchronousCommand wcm:action="add">
-          <Order>17</Order>
          <CommandLine>cmd /C mklink /d %userprofile%\Desktop\Shared \\host.lan\Data</CommandLine>
          <Description>Create desktop shortcut to shared folder</Description>
        </SynchronousCommand>        
        <SynchronousCommand wcm:action="add">
-          <Order>18</Order>
+          <Order>17</Order>
          <CommandLine>cmd /C if exist "C:\OEM\install.bat" start "Install" "cmd /C C:\OEM\install.bat"</CommandLine>
          <Description>Execute custom script from the OEM folder if exists</Description>
        </SynchronousCommand>
--- a/assets/win2016-eval.xml
+++ b/assets/win2016-eval.xml
@ -323,16 +323,11 @@
        </SynchronousCommand>
        <SynchronousCommand wcm:action="add">
          <Order>20</Order>
-          <CommandLine>cmd /C echo 20.20.20.1     host.lan >> %WINDIR%\system32\drivers\etc\hosts</CommandLine>
-          <Description>Add entry in hosts file</Description>
-        </SynchronousCommand>
-        <SynchronousCommand wcm:action="add">
-          <Order>21</Order>
          <CommandLine>cmd /C mklink /d %userprofile%\Desktop\Shared \\host.lan\Data</CommandLine>
          <Description>Create desktop shortcut to shared folder</Description>
        </SynchronousCommand>        
        <SynchronousCommand wcm:action="add">
-          <Order>22</Order>
+          <Order>21</Order>
          <CommandLine>cmd /C if exist "C:\OEM\install.bat" start "Install" "cmd /C C:\OEM\install.bat"</CommandLine>
          <Description>Execute custom script from the OEM folder if exists</Description>
        </SynchronousCommand>
@ -340,4 +335,3 @@
    </component>
  </settings>
 </unattend>
-
--- a/assets/win2016.xml
+++ b/assets/win2016.xml
@ -326,16 +326,11 @@
        </SynchronousCommand>
        <SynchronousCommand wcm:action="add">
          <Order>20</Order>
-          <CommandLine>cmd /C echo 20.20.20.1     host.lan >> %WINDIR%\system32\drivers\etc\hosts</CommandLine>
-          <Description>Add entry in hosts file</Description>
-        </SynchronousCommand>
-        <SynchronousCommand wcm:action="add">
-          <Order>21</Order>
          <CommandLine>cmd /C mklink /d %userprofile%\Desktop\Shared \\host.lan\Data</CommandLine>
          <Description>Create desktop shortcut to shared folder</Description>
        </SynchronousCommand>        
        <SynchronousCommand wcm:action="add">
-          <Order>22</Order>
+          <Order>21</Order>
          <CommandLine>cmd /C if exist "C:\OEM\install.bat" start "Install" "cmd /C C:\OEM\install.bat"</CommandLine>
          <Description>Execute custom script from the OEM folder if exists</Description>
        </SynchronousCommand>
@ -343,4 +338,3 @@
    </component>
  </settings>
 </unattend>
-
--- a/assets/win2019-eval.xml
+++ b/assets/win2019-eval.xml
@ -327,16 +327,11 @@
        </SynchronousCommand>
        <SynchronousCommand wcm:action="add">
          <Order>20</Order>
-          <CommandLine>cmd /C echo 20.20.20.1     host.lan >> %WINDIR%\system32\drivers\etc\hosts</CommandLine>
-          <Description>Add entry in hosts file</Description>
-        </SynchronousCommand>
-        <SynchronousCommand wcm:action="add">
-          <Order>21</Order>
          <CommandLine>cmd /C mklink /d %userprofile%\Desktop\Shared \\host.lan\Data</CommandLine>
          <Description>Create desktop shortcut to shared folder</Description>
        </SynchronousCommand>        
        <SynchronousCommand wcm:action="add">
-          <Order>22</Order>
+          <Order>21</Order>
          <CommandLine>cmd /C if exist "C:\OEM\install.bat" start "Install" "cmd /C C:\OEM\install.bat"</CommandLine>
          <Description>Execute custom script from the OEM folder if exists</Description>
        </SynchronousCommand>
@ -344,4 +339,3 @@
    </component>
  </settings>
 </unattend>
-
--- a/assets/win2019-hv.xml
+++ b/assets/win2019-hv.xml
@ -332,16 +332,11 @@
        </SynchronousCommand>
        <SynchronousCommand wcm:action="add">
          <Order>20</Order>
-          <CommandLine>cmd /C echo 20.20.20.1     host.lan >> %WINDIR%\system32\drivers\etc\hosts</CommandLine>
-          <Description>Add entry in hosts file</Description>
-        </SynchronousCommand>
-        <SynchronousCommand wcm:action="add">
-          <Order>21</Order>
          <CommandLine>cmd /C mklink /d %userprofile%\Desktop\Shared \\host.lan\Data</CommandLine>
          <Description>Create desktop shortcut to shared folder</Description>
        </SynchronousCommand>        
        <SynchronousCommand wcm:action="add">
-          <Order>22</Order>
+          <Order>21</Order>
          <CommandLine>cmd /C if exist "C:\OEM\install.bat" start "Install" "cmd /C C:\OEM\install.bat"</CommandLine>
          <Description>Execute custom script from the OEM folder if exists</Description>
        </SynchronousCommand>
@ -349,4 +344,3 @@
    </component>
  </settings>
 </unattend>
-
--- a/assets/win2019.xml
+++ b/assets/win2019.xml
@ -330,16 +330,11 @@
        </SynchronousCommand>
        <SynchronousCommand wcm:action="add">
          <Order>20</Order>
-          <CommandLine>cmd /C echo 20.20.20.1     host.lan >> %WINDIR%\system32\drivers\etc\hosts</CommandLine>
-          <Description>Add entry in hosts file</Description>
-        </SynchronousCommand>
-        <SynchronousCommand wcm:action="add">
-          <Order>21</Order>
          <CommandLine>cmd /C mklink /d %userprofile%\Desktop\Shared \\host.lan\Data</CommandLine>
          <Description>Create desktop shortcut to shared folder</Description>
        </SynchronousCommand>        
        <SynchronousCommand wcm:action="add">
-          <Order>22</Order>
+          <Order>21</Order>
          <CommandLine>cmd /C if exist "C:\OEM\install.bat" start "Install" "cmd /C C:\OEM\install.bat"</CommandLine>
          <Description>Execute custom script from the OEM folder if exists</Description>
        </SynchronousCommand>
--- a/assets/win2022-eval.xml
+++ b/assets/win2022-eval.xml
@ -327,16 +327,11 @@
        </SynchronousCommand>
        <SynchronousCommand wcm:action="add">
          <Order>20</Order>
-          <CommandLine>cmd /C echo 20.20.20.1     host.lan >> %WINDIR%\system32\drivers\etc\hosts</CommandLine>
-          <Description>Add entry in hosts file</Description>
-        </SynchronousCommand>
-        <SynchronousCommand wcm:action="add">
-          <Order>21</Order>
          <CommandLine>cmd /C mklink /d %userprofile%\Desktop\Shared \\host.lan\Data</CommandLine>
          <Description>Create desktop shortcut to shared folder</Description>
        </SynchronousCommand>        
        <SynchronousCommand wcm:action="add">
-          <Order>22</Order>
+          <Order>21</Order>
          <CommandLine>cmd /C if exist "C:\OEM\install.bat" start "Install" "cmd /C C:\OEM\install.bat"</CommandLine>
          <Description>Execute custom script from the OEM folder if exists</Description>
        </SynchronousCommand>
@ -344,4 +339,3 @@
    </component>
  </settings>
 </unattend>
-
--- a/assets/win2022.xml
+++ b/assets/win2022.xml
@ -330,16 +330,11 @@
        </SynchronousCommand>
        <SynchronousCommand wcm:action="add">
          <Order>20</Order>
-          <CommandLine>cmd /C echo 20.20.20.1     host.lan >> %WINDIR%\system32\drivers\etc\hosts</CommandLine>
-          <Description>Add entry in hosts file</Description>
-        </SynchronousCommand>
-        <SynchronousCommand wcm:action="add">
-          <Order>21</Order>
          <CommandLine>cmd /C mklink /d %userprofile%\Desktop\Shared \\host.lan\Data</CommandLine>
          <Description>Create desktop shortcut to shared folder</Description>
        </SynchronousCommand>        
        <SynchronousCommand wcm:action="add">
-          <Order>22</Order>
+          <Order>21</Order>
          <CommandLine>cmd /C if exist "C:\OEM\install.bat" start "Install" "cmd /C C:\OEM\install.bat"</CommandLine>
          <Description>Execute custom script from the OEM folder if exists</Description>
        </SynchronousCommand>
@ -347,4 +342,3 @@
    </component>
  </settings>
 </unattend>
-
--- a/assets/win2025-eval.xml
+++ b/assets/win2025-eval.xml
@ -342,16 +342,11 @@
        </SynchronousCommand>
        <SynchronousCommand wcm:action="add">
          <Order>22</Order>
-          <CommandLine>cmd /C echo 20.20.20.1     host.lan >> %WINDIR%\system32\drivers\etc\hosts</CommandLine>
-          <Description>Add entry in hosts file</Description>
-        </SynchronousCommand>
-        <SynchronousCommand wcm:action="add">
-          <Order>23</Order>
          <CommandLine>cmd /C mklink /d %userprofile%\Desktop\Shared \\host.lan\Data</CommandLine>
          <Description>Create desktop shortcut to shared folder</Description>
        </SynchronousCommand>        
        <SynchronousCommand wcm:action="add">
-          <Order>24</Order>
+          <Order>23</Order>
          <CommandLine>cmd /C if exist "C:\OEM\install.bat" start "Install" "cmd /C C:\OEM\install.bat"</CommandLine>
          <Description>Execute custom script from the OEM folder if exists</Description>
        </SynchronousCommand>
@ -359,4 +354,3 @@
    </component>
  </settings>
 </unattend>
-
--- a/assets/win2025.xml
+++ b/assets/win2025.xml
@ -345,16 +345,11 @@
        </SynchronousCommand>
        <SynchronousCommand wcm:action="add">
          <Order>22</Order>
-          <CommandLine>cmd /C echo 20.20.20.1     host.lan >> %WINDIR%\system32\drivers\etc\hosts</CommandLine>
-          <Description>Add entry in hosts file</Description>
-        </SynchronousCommand>
-        <SynchronousCommand wcm:action="add">
-          <Order>23</Order>
          <CommandLine>cmd /C mklink /d %userprofile%\Desktop\Shared \\host.lan\Data</CommandLine>
          <Description>Create desktop shortcut to shared folder</Description>
        </SynchronousCommand>        
        <SynchronousCommand wcm:action="add">
-          <Order>24</Order>
+          <Order>23</Order>
          <CommandLine>cmd /C if exist "C:\OEM\install.bat" start "Install" "cmd /C C:\OEM\install.bat"</CommandLine>
          <Description>Execute custom script from the OEM folder if exists</Description>
        </SynchronousCommand>
--- a/assets/win7x64-enterprise-eval.xml
+++ b/assets/win7x64-enterprise-eval.xml
@ -269,16 +269,11 @@
        </SynchronousCommand>
        <SynchronousCommand wcm:action="add">
          <Order>17</Order>
-          <CommandLine>cmd /C echo 20.20.20.1     host.lan >> %WINDIR%\system32\drivers\etc\hosts</CommandLine>
-          <Description>Add entry in hosts file</Description>
-        </SynchronousCommand>
-        <SynchronousCommand wcm:action="add">
-          <Order>18</Order>
          <CommandLine>cmd /C mklink /d %userprofile%\Desktop\Shared \\host.lan\Data</CommandLine>
          <Description>Create desktop shortcut to shared folder</Description>
        </SynchronousCommand>        
        <SynchronousCommand wcm:action="add">
-          <Order>19</Order>
+          <Order>18</Order>
          <CommandLine>cmd /C if exist "C:\OEM\install.bat" start "Install" "cmd /C C:\OEM\install.bat"</CommandLine>
          <Description>Execute custom script from the OEM folder if exists</Description>
        </SynchronousCommand>
--- a/assets/win7x64-enterprise.xml
+++ b/assets/win7x64-enterprise.xml
@ -273,16 +273,11 @@
        </SynchronousCommand>
        <SynchronousCommand wcm:action="add">
          <Order>17</Order>
-          <CommandLine>cmd /C echo 20.20.20.1     host.lan >> %WINDIR%\system32\drivers\etc\hosts</CommandLine>
-          <Description>Add entry in hosts file</Description>
-        </SynchronousCommand>
-        <SynchronousCommand wcm:action="add">
-          <Order>18</Order>
          <CommandLine>cmd /C mklink /d %userprofile%\Desktop\Shared \\host.lan\Data</CommandLine>
          <Description>Create desktop shortcut to shared folder</Description>
        </SynchronousCommand>        
        <SynchronousCommand wcm:action="add">
-          <Order>19</Order>
+          <Order>18</Order>
          <CommandLine>cmd /C if exist "C:\OEM\install.bat" start "Install" "cmd /C C:\OEM\install.bat"</CommandLine>
          <Description>Execute custom script from the OEM folder if exists</Description>
        </SynchronousCommand>
--- a/assets/win7x64-ultimate.xml
+++ b/assets/win7x64-ultimate.xml
@ -273,16 +273,11 @@
        </SynchronousCommand>
        <SynchronousCommand wcm:action="add">
          <Order>17</Order>
-          <CommandLine>cmd /C echo 20.20.20.1     host.lan >> %WINDIR%\system32\drivers\etc\hosts</CommandLine>
-          <Description>Add entry in hosts file</Description>
-        </SynchronousCommand>
-        <SynchronousCommand wcm:action="add">
-          <Order>18</Order>
          <CommandLine>cmd /C mklink /d %userprofile%\Desktop\Shared \\host.lan\Data</CommandLine>
          <Description>Create desktop shortcut to shared folder</Description>
        </SynchronousCommand>        
        <SynchronousCommand wcm:action="add">
-          <Order>19</Order>
+          <Order>18</Order>
          <CommandLine>cmd /C if exist "C:\OEM\install.bat" start "Install" "cmd /C C:\OEM\install.bat"</CommandLine>
          <Description>Execute custom script from the OEM folder if exists</Description>
        </SynchronousCommand>
--- a/assets/win7x64.xml
+++ b/assets/win7x64.xml
@ -273,16 +273,11 @@
        </SynchronousCommand>
        <SynchronousCommand wcm:action="add">
          <Order>17</Order>
-          <CommandLine>cmd /C echo 20.20.20.1     host.lan >> %WINDIR%\system32\drivers\etc\hosts</CommandLine>
-          <Description>Add entry in hosts file</Description>
-        </SynchronousCommand>
-        <SynchronousCommand wcm:action="add">
-          <Order>18</Order>
          <CommandLine>cmd /C mklink /d %userprofile%\Desktop\Shared \\host.lan\Data</CommandLine>
          <Description>Create desktop shortcut to shared folder</Description>
        </SynchronousCommand>        
        <SynchronousCommand wcm:action="add">
-          <Order>19</Order>
+          <Order>18</Order>
          <CommandLine>cmd /C if exist "C:\OEM\install.bat" start "Install" "cmd /C C:\OEM\install.bat"</CommandLine>
          <Description>Execute custom script from the OEM folder if exists</Description>
        </SynchronousCommand>
--- a/assets/win7x86-enterprise.xml
+++ b/assets/win7x86-enterprise.xml
@ -273,16 +273,11 @@
        </SynchronousCommand>
        <SynchronousCommand wcm:action="add">
          <Order>17</Order>
-          <CommandLine>cmd /C echo 20.20.20.1     host.lan >> %WINDIR%\system32\drivers\etc\hosts</CommandLine>
-          <Description>Add entry in hosts file</Description>
-        </SynchronousCommand>
-        <SynchronousCommand wcm:action="add">
-          <Order>18</Order>
          <CommandLine>cmd /C mklink /d %userprofile%\Desktop\Shared \\host.lan\Data</CommandLine>
          <Description>Create desktop shortcut to shared folder</Description>
        </SynchronousCommand>        
        <SynchronousCommand wcm:action="add">
-          <Order>19</Order>
+          <Order>18</Order>
          <CommandLine>cmd /C if exist "C:\OEM\install.bat" start "Install" "cmd /C C:\OEM\install.bat"</CommandLine>
          <Description>Execute custom script from the OEM folder if exists</Description>
        </SynchronousCommand>
--- a/assets/win7x86-ultimate.xml
+++ b/assets/win7x86-ultimate.xml
@ -273,16 +273,11 @@
        </SynchronousCommand>
        <SynchronousCommand wcm:action="add">
          <Order>17</Order>
-          <CommandLine>cmd /C echo 20.20.20.1     host.lan >> %WINDIR%\system32\drivers\etc\hosts</CommandLine>
-          <Description>Add entry in hosts file</Description>
-        </SynchronousCommand>
-        <SynchronousCommand wcm:action="add">
-          <Order>18</Order>
          <CommandLine>cmd /C mklink /d %userprofile%\Desktop\Shared \\host.lan\Data</CommandLine>
          <Description>Create desktop shortcut to shared folder</Description>
        </SynchronousCommand>        
        <SynchronousCommand wcm:action="add">
-          <Order>19</Order>
+          <Order>18</Order>
          <CommandLine>cmd /C if exist "C:\OEM\install.bat" start "Install" "cmd /C C:\OEM\install.bat"</CommandLine>
          <Description>Execute custom script from the OEM folder if exists</Description>
        </SynchronousCommand>
--- a/assets/win7x86.xml
+++ b/assets/win7x86.xml
@ -273,16 +273,11 @@
        </SynchronousCommand>
        <SynchronousCommand wcm:action="add">
          <Order>17</Order>
-          <CommandLine>cmd /C echo 20.20.20.1     host.lan >> %WINDIR%\system32\drivers\etc\hosts</CommandLine>
-          <Description>Add entry in hosts file</Description>
-        </SynchronousCommand>
-        <SynchronousCommand wcm:action="add">
-          <Order>18</Order>
          <CommandLine>cmd /C mklink /d %userprofile%\Desktop\Shared \\host.lan\Data</CommandLine>
          <Description>Create desktop shortcut to shared folder</Description>
        </SynchronousCommand>        
        <SynchronousCommand wcm:action="add">
-          <Order>19</Order>
+          <Order>18</Order>
          <CommandLine>cmd /C if exist "C:\OEM\install.bat" start "Install" "cmd /C C:\OEM\install.bat"</CommandLine>
          <Description>Execute custom script from the OEM folder if exists</Description>
        </SynchronousCommand>
--- a/assets/win81x64-enterprise-eval.xml
+++ b/assets/win81x64-enterprise-eval.xml
@ -288,16 +288,11 @@
        </SynchronousCommand>
        <SynchronousCommand wcm:action="add">
          <Order>16</Order>
-          <CommandLine>cmd /C echo 20.20.20.1     host.lan >> %WINDIR%\system32\drivers\etc\hosts</CommandLine>
-          <Description>Add entry in hosts file</Description>
-        </SynchronousCommand>
-        <SynchronousCommand wcm:action="add">
-          <Order>17</Order>
          <CommandLine>cmd /C mklink /d %userprofile%\Desktop\Shared \\host.lan\Data</CommandLine>
          <Description>Create desktop shortcut to shared folder</Description>
        </SynchronousCommand>        
        <SynchronousCommand wcm:action="add">
-          <Order>18</Order>
+          <Order>17</Order>
          <CommandLine>cmd /C if exist "C:\OEM\install.bat" start "Install" "cmd /C C:\OEM\install.bat"</CommandLine>
          <Description>Execute custom script from the OEM folder if exists</Description>
        </SynchronousCommand>
@ -305,4 +300,3 @@
    </component>
  </settings>
 </unattend>
-
--- a/assets/win81x64-enterprise.xml
+++ b/assets/win81x64-enterprise.xml
@ -291,16 +291,11 @@
        </SynchronousCommand>
        <SynchronousCommand wcm:action="add">
          <Order>16</Order>
-          <CommandLine>cmd /C echo 20.20.20.1     host.lan >> %WINDIR%\system32\drivers\etc\hosts</CommandLine>
-          <Description>Add entry in hosts file</Description>
-        </SynchronousCommand>
-        <SynchronousCommand wcm:action="add">
-          <Order>17</Order>
          <CommandLine>cmd /C mklink /d %userprofile%\Desktop\Shared \\host.lan\Data</CommandLine>
          <Description>Create desktop shortcut to shared folder</Description>
        </SynchronousCommand>        
        <SynchronousCommand wcm:action="add">
-          <Order>18</Order>
+          <Order>17</Order>
          <CommandLine>cmd /C if exist "C:\OEM\install.bat" start "Install" "cmd /C C:\OEM\install.bat"</CommandLine>
          <Description>Execute custom script from the OEM folder if exists</Description>
        </SynchronousCommand>
--- a/assets/win81x64.xml
+++ b/assets/win81x64.xml
@ -298,16 +298,11 @@
        </SynchronousCommand>
        <SynchronousCommand wcm:action="add">
          <Order>16</Order>
-          <CommandLine>cmd /C echo 20.20.20.1     host.lan >> %WINDIR%\system32\drivers\etc\hosts</CommandLine>
-          <Description>Add entry in hosts file</Description>
-        </SynchronousCommand>
-        <SynchronousCommand wcm:action="add">
-          <Order>17</Order>
          <CommandLine>cmd /C mklink /d %userprofile%\Desktop\Shared \\host.lan\Data</CommandLine>
          <Description>Create desktop shortcut to shared folder</Description>
        </SynchronousCommand>        
        <SynchronousCommand wcm:action="add">
-          <Order>18</Order>
+          <Order>17</Order>
          <CommandLine>cmd /C if exist "C:\OEM\install.bat" start "Install" "cmd /C C:\OEM\install.bat"</CommandLine>
          <Description>Execute custom script from the OEM folder if exists</Description>
        </SynchronousCommand>
--- a/assets/winvistax64-enterprise.xml
+++ b/assets/winvistax64-enterprise.xml
@ -247,16 +247,11 @@
        </SynchronousCommand>
        <SynchronousCommand wcm:action="add">
          <Order>22</Order>
-          <CommandLine>cmd /C echo 20.20.20.1     host.lan >> %WINDIR%\system32\drivers\etc\hosts</CommandLine>
-          <Description>Add entry in hosts file</Description>
-        </SynchronousCommand>
-        <SynchronousCommand wcm:action="add">
-          <Order>23</Order>
          <CommandLine>cmd /C mklink /d %userprofile%\Desktop\Shared \\host.lan\Data</CommandLine>
          <Description>Create desktop shortcut to shared folder</Description>
        </SynchronousCommand>        
        <SynchronousCommand wcm:action="add">
-          <Order>24</Order>
+          <Order>23</Order>
          <CommandLine>cmd /C if exist "C:\OEM\install.bat" start "Install" "cmd /C C:\OEM\install.bat"</CommandLine>
          <Description>Execute custom script from the OEM folder if exists</Description>
        </SynchronousCommand>
--- a/assets/winvistax64-ultimate.xml
+++ b/assets/winvistax64-ultimate.xml
@ -247,16 +247,11 @@
        </SynchronousCommand>
        <SynchronousCommand wcm:action="add">
          <Order>22</Order>
-          <CommandLine>cmd /C echo 20.20.20.1     host.lan >> %WINDIR%\system32\drivers\etc\hosts</CommandLine>
-          <Description>Add entry in hosts file</Description>
-        </SynchronousCommand>
-        <SynchronousCommand wcm:action="add">
-          <Order>23</Order>
          <CommandLine>cmd /C mklink /d %userprofile%\Desktop\Shared \\host.lan\Data</CommandLine>
          <Description>Create desktop shortcut to shared folder</Description>
        </SynchronousCommand>        
        <SynchronousCommand wcm:action="add">
-          <Order>24</Order>
+          <Order>23</Order>
          <CommandLine>cmd /C if exist "C:\OEM\install.bat" start "Install" "cmd /C C:\OEM\install.bat"</CommandLine>
          <Description>Execute custom script from the OEM folder if exists</Description>
        </SynchronousCommand>
@ -264,4 +259,3 @@
    </component>
  </settings>
 </unattend>
-
--- a/assets/winvistax64.xml
+++ b/assets/winvistax64.xml
@ -247,16 +247,11 @@
        </SynchronousCommand>
        <SynchronousCommand wcm:action="add">
          <Order>22</Order>
-          <CommandLine>cmd /C echo 20.20.20.1     host.lan >> %WINDIR%\system32\drivers\etc\hosts</CommandLine>
-          <Description>Add entry in hosts file</Description>
-        </SynchronousCommand>
-        <SynchronousCommand wcm:action="add">
-          <Order>23</Order>
          <CommandLine>cmd /C mklink /d %userprofile%\Desktop\Shared \\host.lan\Data</CommandLine>
          <Description>Create desktop shortcut to shared folder</Description>
        </SynchronousCommand>        
        <SynchronousCommand wcm:action="add">
-          <Order>24</Order>
+          <Order>23</Order>
          <CommandLine>cmd /C if exist "C:\OEM\install.bat" start "Install" "cmd /C C:\OEM\install.bat"</CommandLine>
          <Description>Execute custom script from the OEM folder if exists</Description>
        </SynchronousCommand>
@ -264,4 +259,3 @@
    </component>
  </settings>
 </unattend>
-
--- a/assets/winvistax86-enterprise.xml
+++ b/assets/winvistax86-enterprise.xml
@ -247,16 +247,11 @@
        </SynchronousCommand>
        <SynchronousCommand wcm:action="add">
          <Order>22</Order>
-          <CommandLine>cmd /C echo 20.20.20.1     host.lan >> %WINDIR%\system32\drivers\etc\hosts</CommandLine>
-          <Description>Add entry in hosts file</Description>
-        </SynchronousCommand>
-        <SynchronousCommand wcm:action="add">
-          <Order>23</Order>
          <CommandLine>cmd /C mklink /d %userprofile%\Desktop\Shared \\host.lan\Data</CommandLine>
          <Description>Create desktop shortcut to shared folder</Description>
        </SynchronousCommand>        
        <SynchronousCommand wcm:action="add">
-          <Order>24</Order>
+          <Order>23</Order>
          <CommandLine>cmd /C if exist "C:\OEM\install.bat" start "Install" "cmd /C C:\OEM\install.bat"</CommandLine>
          <Description>Execute custom script from the OEM folder if exists</Description>
        </SynchronousCommand>
@ -264,4 +259,3 @@
    </component>
  </settings>
 </unattend>
-
--- a/assets/winvistax86-ultimate.xml
+++ b/assets/winvistax86-ultimate.xml
@ -247,16 +247,11 @@
        </SynchronousCommand>
        <SynchronousCommand wcm:action="add">
          <Order>22</Order>
-          <CommandLine>cmd /C echo 20.20.20.1     host.lan >> %WINDIR%\system32\drivers\etc\hosts</CommandLine>
-          <Description>Add entry in hosts file</Description>
-        </SynchronousCommand>
-        <SynchronousCommand wcm:action="add">
-          <Order>23</Order>
          <CommandLine>cmd /C mklink /d %userprofile%\Desktop\Shared \\host.lan\Data</CommandLine>
          <Description>Create desktop shortcut to shared folder</Description>
        </SynchronousCommand>        
        <SynchronousCommand wcm:action="add">
-          <Order>24</Order>
+          <Order>23</Order>
          <CommandLine>cmd /C if exist "C:\OEM\install.bat" start "Install" "cmd /C C:\OEM\install.bat"</CommandLine>
          <Description>Execute custom script from the OEM folder if exists</Description>
        </SynchronousCommand>
--- a/assets/winvistax86.xml
+++ b/assets/winvistax86.xml
@ -247,16 +247,11 @@
        </SynchronousCommand>
        <SynchronousCommand wcm:action="add">
          <Order>22</Order>
-          <CommandLine>cmd /C echo 20.20.20.1     host.lan >> %WINDIR%\system32\drivers\etc\hosts</CommandLine>
-          <Description>Add entry in hosts file</Description>
-        </SynchronousCommand>
-        <SynchronousCommand wcm:action="add">
-          <Order>23</Order>
          <CommandLine>cmd /C mklink /d %userprofile%\Desktop\Shared \\host.lan\Data</CommandLine>
          <Description>Create desktop shortcut to shared folder</Description>
        </SynchronousCommand>        
        <SynchronousCommand wcm:action="add">
-          <Order>24</Order>
+          <Order>23</Order>
          <CommandLine>cmd /C if exist "C:\OEM\install.bat" start "Install" "cmd /C C:\OEM\install.bat"</CommandLine>
          <Description>Execute custom script from the OEM folder if exists</Description>
        </SynchronousCommand>
@ -264,4 +259,3 @@
    </component>
  </settings>
 </unattend>
-
--- a/src/define.sh
+++ b/src/define.sh
@ -1584,9 +1584,6 @@ prepareInstall() {
  [ -n "$PASSWORD" ] && password=$(echo "$PASSWORD" | sed 's/"//g')
  [ -z "$password" ] && password="admin"

-  local ip="20.20.20.1"
-  [ -n "${VM_NET_IP:-}" ] && ip="${VM_NET_IP%.*}.1"
-
  find "$target" -maxdepth 1 -type f -iname winnt.sif -exec rm {} \;

  {       echo "[Data]"
@ -1769,14 +1766,6 @@ prepareInstall() {
          echo ""
          echo "Call Domain.MoveHere(LocalAdminADsPath, \"$username\")"
          echo ""
-          echo "With (CreateObject(\"Scripting.FileSystemObject\"))"
-          echo "  SysRoot = WshShell.ExpandEnvironmentStrings(\"%SystemRoot%\")"
-          echo "  Set oFile = .OpenTextFile(SysRoot & \"\system32\drivers\etc\hosts\", 8, true)"
-          echo "  oFile.Write(\"$ip      host.lan\")"
-          echo "  oFile.Close()"
-          echo "  Set oFile = Nothing"
-          echo "End With"
-          echo ""
          echo "Set oLink = WshShell.CreateShortcut(WshShell.ExpandEnvironmentStrings(\"%userprofile%\\Desktop\\Shared.lnk\"))"
          echo "With oLink"
          echo "  .TargetPath = \"\\\\host.lan\\Data\""
--- a/src/install.sh
+++ b/src/install.sh
@ -756,10 +756,6 @@ updateXML() {
  local language="$2"
  local culture region user admin pass keyboard

-  if [ -n "${VM_NET_IP:-}" ]; then
-    sed -i "s/ 20.20.20.1 / ${VM_NET_IP%.*}.1 /g" "$asset"
-  fi
-
  [ -z "$HEIGHT" ] && HEIGHT="720"
  [ -z "$WIDTH" ] && WIDTH="1280"

--- a/src/power.sh
+++ b/src/power.sh
@ -103,11 +103,19 @@ finish() {

  pid="/var/run/tpm.pid"
  [ -s "$pid" ] && pKill "$(<"$pid")"
+  rm -f "$pid"

  pid="/var/run/wsdd.pid"
  [ -s "$pid" ] && pKill "$(<"$pid")"
+  rm -f "$pid"

-  fKill "smbd"
+  pid="/var/run/samba/nmbd.pid"
+  [ -s "$pid" ] && pKill "$(<"$pid")"
+  rm -f "$pid"
+
+  pid="/var/run/samba/smbd.pid"
+  [ -s "$pid" ] && pKill "$(<"$pid")"
+  rm -f "$pid"

  closeNetwork

--- a/src/samba.sh
+++ b/src/samba.sh
@ -7,7 +7,10 @@ set -Eeuo pipefail

 tmp="/tmp/smb"
 rm -rf "$tmp"
-rm -rf /var/run/wsdd.pid
+
+rm -f /var/run/wsdd.pid
+rm -f /var/run/samba/nmbd.pid
+rm -f /var/run/samba/smbd.pid

 [[ "$SAMBA" == [Nn]* ]] && return 0
 [[ "$NETWORK" == [Nn]* ]] && return 0
@ -19,16 +22,15 @@ else
  hostname="host.lan"
  case "${NETWORK,,}" in
    "user"* | "passt" | "slirp" )
-      interfaces="lo"
-      if ! ip link set "$interfaces" multicast on >/dev/null; then
-        warn "Failed to enable multicast on loopback interface!"
-      fi ;;
-    *)
-      interfaces="dockerbridge"
-      if [ -n "${SAMBA_INTERFACE:-}" ]; then
-        interfaces+=",$SAMBA_INTERFACE"
-      fi ;;
+      interfaces="lo" ;;
+      # if ! ip link set "$interfaces" multicast on >/dev/null; then
+      #  warn "Failed to enable multicast on loopback interface!"
+      # fi ;;
+    *) interfaces="$VM_NET_BRIDGE" ;;
  esac
+  if [ -n "${SAMBA_INTERFACE:-}" ]; then
+    interfaces+=",$SAMBA_INTERFACE"
+  fi
 fi

 html "Initializing shared folder..."
@ -37,7 +39,7 @@ html "Initializing shared folder..."
 addShare() {
  local dir="$1"
  local ref="$2"
-  local name="$3" 
+  local name="$3"
  local comment="$4"

  mkdir -p "$dir" || return 1
Author	SHA1	Message	Date
Kroese	c04851bbd4	feat: Remove entry from hosts file (#1456 )	2025-10-06 13:45:14 +02:00
Kroese	588242b175	fix: Use bridge name variable (#1455 )	2025-10-06 13:44:05 +02:00
Kroese	3ab5c25152	feat: Use PID for Samba process (#1454 )	2025-10-06 13:22:28 +02:00