Veuillez saisir le message de validation pour vos modifications. Les lignes

 commençant par '' seront ignorées, et un message vide abandonne la validation.

 Sur la branche dev
 Votre branche est en avance sur 'origin/dev' de 1 commit.
   (utilisez "git push" pour publier vos commits locaux)

 Modifications qui seront validées :
	modifié :         src/lufus/writing/install_ventoy.py
	modifié :         src/lufus/writing/windows/flash.py
	modifié :         src/lufus/writing/windows/tweaks.py

Author: R-Larocque

src/lufus/writing/install_ventoy.py

@@ -162,7 +162,7 @@ def install_grub(target_device: str) -> bool:
         # Refresh kernel table
         subprocess.run(["partprobe", target_device], check=False)
         subprocess.run(["udevadm", "settle"], check=False)
-        subprocess.run(["sync"], check=True)
+        os.sync()
 
         # Wait for device nodes to be created by udev
         efi_part = f"{target_device}{sep}2"

src/lufus/writing/windows/flash.py

@@ -71,12 +71,12 @@ def _fix_efi_bootloader(efi_mount):
 
     log.info("EFI bootloader fix: BOOTX64.EFI not found, will attempt to create at %s", boot_dir)
     bootx64 = os.path.join(boot_dir, "BOOTX64.EFI")
-    run_cmd(["sudo", "mkdir", "-p", boot_dir])
+    os.makedirs(boot_dir, exist_ok=True)
     log.info("EFI bootloader fix: created directory %s", boot_dir)
 
     src = _find_path_case_insensitive(efi_mount, "EFI", "Microsoft", "Boot", "bootmgfw.efi")
     if src:
-        run_cmd(["sudo", "cp", src, bootx64])
+        shutil.copy2(src, bootx64)
         log.info("EFI bootloader fix: copied %s -> %s", src, bootx64)
         return
 
@@ -155,7 +155,7 @@ def _copy_file(src: str, dst: str) -> str:
 def _find_ntfs_tool(status_cb=None) -> str | None:
     """Find mkfs.ntfs/mkntfs, installing ntfs-3g if needed. Returns command name or None."""
     for candidate in ["mkfs.ntfs", "mkntfs"]:
-        if subprocess.run(["which", candidate], capture_output=True).returncode == 0:
+        if shutil.which(candidate):
             return candidate
 
     if status_cb:
@@ -167,21 +167,21 @@ def _find_ntfs_tool(status_cb=None) -> str | None:
         ["zypper", "install", "-y", "ntfs-3g"],
     ]
     for pm_cmd in pkg_managers:
-        if subprocess.run(["which", pm_cmd[0]], capture_output=True).returncode == 0:
+        if shutil.which(pm_cmd[0]):
             run_cmd(["sudo"] + pm_cmd)
             break  # stop after the first working package manager
 
     # Re-check after installation attempt
     for candidate in ["mkfs.ntfs", "mkntfs"]:
-        if subprocess.run(["which", candidate], capture_output=True).returncode == 0:
+        if shutil.which(candidate):
             return candidate  # installation succeeded
 
     return None
 
 
 def _ensure_wimlib(status_cb=None) -> None:
     """Install wimlib-imagex if not present. Raises FileNotFoundError if it can't be found after install."""
-    if subprocess.run(["which", "wimlib-imagex"], capture_output=True).returncode == 0:
+    if shutil.which("wimlib-imagex"):
         return
     if status_cb:
         status_cb("wimlib-imagex not found, attempting to install...")
@@ -192,10 +192,10 @@ def _ensure_wimlib(status_cb=None) -> None:
         ["zypper", "install", "-y", "wimtools"],
     ]
     for pm_cmd in pkg_managers:
-        if subprocess.run(["which", pm_cmd[0]], capture_output=True).returncode == 0:
+        if shutil.which(pm_cmd[0]):
             run_cmd(["sudo"] + pm_cmd)
             break
-    if subprocess.run(["which", "wimlib-imagex"], capture_output=True).returncode != 0:
+    if not shutil.which("wimlib-imagex"):
         raise FileNotFoundError(
             "wimlib-imagex not found. Install manually: sudo pacman -S wimlib  /  sudo apt install wimtools"
         )
@@ -271,20 +271,34 @@ def _copy_efi_boot_files(iso_mount, mount_efi, _status):
     if efi_src:
         efi_items = os.listdir(efi_src)
         _status(f"Found EFI/ with {len(efi_items)} items: {efi_items}")
-        run_cmd(["sudo", "cp", "-r"] + [os.path.join(efi_src, i) for i in efi_items] + [mount_efi])
+        for item in efi_items:
+            src_path = os.path.join(efi_src, item)
+            dst_path = os.path.join(mount_efi, "EFI", item)
+            if os.path.isdir(src_path):
+                shutil.copytree(src_path, dst_path, dirs_exist_ok=True)
+            else:
+                os.makedirs(os.path.dirname(dst_path), exist_ok=True)
+                shutil.copy2(src_path, dst_path)
         _status("Copied EFI/ tree to EFI partition")
     else:
         _status("WARNING: No EFI directory found in ISO - drive may not be UEFI bootable")
 
     boot_src = _find_path_case_insensitive(iso_mount, "boot")
     if boot_src:
-        run_cmd(["sudo", "cp", "-r"] + [os.path.join(boot_src, i) for i in os.listdir(boot_src)] + [mount_efi])
+        for item in os.listdir(boot_src):
+            src_path = os.path.join(boot_src, item)
+            dst_path = os.path.join(mount_efi, "boot", item)
+            if os.path.isdir(src_path):
+                shutil.copytree(src_path, dst_path, dirs_exist_ok=True)
+            else:
+                os.makedirs(os.path.dirname(dst_path), exist_ok=True)
+                shutil.copy2(src_path, dst_path)
         _status("Copied boot/ tree to EFI partition")
 
     for fname in ["bootmgr", "bootmgr.efi"]:
         src = _find_path_case_insensitive(iso_mount, fname)
         if src:
-            run_cmd(["sudo", "cp", src, f"{mount_efi}/{fname}"])
+            shutil.copy2(src, os.path.join(mount_efi, fname))
             _status(f"Copied {fname} to EFI partition root")
 
     _fix_efi_bootloader(mount_efi)
@@ -412,7 +426,7 @@ def _status(msg):
 
                 # Step 7: Sync
                 _status("Syncing all writes to disk...")
-                run_cmd(["sudo", "sync"])
+                os.sync()
                 _emit(97)
                 _status("Sync complete")
 

src/lufus/writing/windows/tweaks.py

@@ -9,6 +9,7 @@
 import re
 import subprocess
 import os
+import shutil
 from lufus.utils import get_mount_and_drive
 from lufus import state
 from lufus.lufus_logging import get_logger
@@ -54,7 +55,7 @@ def win_hardware_bypass():
     cmd_string = "\n".join(commands) + "\n"
     log.info("win_hardware_bypass: injecting registry keys into boot.wim at %s...", mount)
     try:
-        subprocess.run(["mkdir", "/media/tempwinmnt"], check=True)
+        os.makedirs("/media/tempwinmnt", exist_ok=True)
         subprocess.run(["wimmountrw", f"{mount}/sources/boot.wim", "2", "/media/tempwinmnt"], check=True)
         subprocess.run(
             ["chntpw", "e", "/media/tempwinmnt/Windows/System32/config/SYSTEM"],
@@ -64,7 +65,7 @@ def win_hardware_bypass():
             check=True,
         )
         subprocess.run(["wimunmount", "/media/tempwinmnt", "--commit"], check=True)
-        subprocess.run(["rm", "-rf", "/media/tempwinmnt"], check=True)
+        shutil.rmtree("/media/tempwinmnt", ignore_errors=True)
         log.info("win_hardware_bypass: registry keys injected successfully.")
     except subprocess.CalledProcessError as e:
         log.error("win_hardware_bypass: CalledProcessError: %s", e.stderr)
@@ -79,7 +80,7 @@ def win_local_acc():
     cmd_string = "\n".join(commands) + "\n"
     log.info("win_local_acc: bypassing online account requirement at %s...", mount)
     try:
-        subprocess.run(["mkdir", "/media/tempwinmnt"], check=True)
+        os.makedirs("/media/tempwinmnt", exist_ok=True)
         subprocess.run(["wimmountrw", f"{mount}/sources/boot.wim", "2", "/media/tempwinmnt"], check=True)
         subprocess.run(
             ["chntpw", "e", "/media/tempwinmnt/Windows/System32/config/SOFTWARE"],
@@ -89,7 +90,7 @@ def win_local_acc():
             check=True,
         )
         subprocess.run(["wimunmount", "/media/tempwinmnt", "--commit"], check=True)
-        subprocess.run(["rm", "-rf", "/media/tempwinmnt"], check=True)
+        shutil.rmtree("/media/tempwinmnt", ignore_errors=True)
         log.info("win_local_acc: online account bypass applied successfully.")
     except subprocess.CalledProcessError as e:
         log.error("win_local_acc: CalledProcessError: %s", e.stderr)