sima-cli 0.0.20__py3-none-any.whl → 0.0.22__py3-none-any.whl

sima_cli/network/network.py

@@ -0,0 +1,208 @@
+from InquirerPy import inquirer
+import subprocess
+import os
+import re
+import time
+from sima_cli.utils.env import is_sima_board
+
+IP_CMD = "/sbin/ip"
+
+def extract_interface_index(name):
+    """Extract numeric index from interface name for sorting (e.g., end0 → 0)."""
+    match = re.search(r'(\d+)$', name)
+    return int(match.group(1)) if match else float('inf')
+
+def get_interfaces():
+    interfaces = []
+    ip_output = subprocess.check_output([IP_CMD, '-o', 'link', 'show']).decode()
+    for line in ip_output.splitlines():
+        match = re.match(r'\d+: (\w+):', line)
+        if match:
+            iface = match.group(1)
+            if iface.startswith('lo'):
+                continue
+            try:
+                with open(f"/sys/class/net/{iface}/carrier") as f:
+                    carrier = f.read().strip() == "1"
+            except FileNotFoundError:
+                carrier = False
+
+            try:
+                ip_addr = subprocess.check_output([IP_CMD, '-4', 'addr', 'show', iface]).decode()
+                ip_match = re.search(r'inet (\d+\.\d+\.\d+\.\d+)', ip_addr)
+                ip = ip_match.group(1) if ip_match else "IP Not Assigned"
+            except subprocess.CalledProcessError:
+                ip = "IP Not Assigned"
+
+            # Check internet connectivity only if carrier is up
+            internet = False
+            if carrier:
+                try:
+                    result = subprocess.run(
+                        ["ping", "-I", iface, "-c", "1", "-W", "1", "8.8.8.8"],
+                        stdout=subprocess.DEVNULL,
+                        stderr=subprocess.DEVNULL
+                    )
+                    internet = result.returncode == 0
+                except Exception:
+                    internet = False
+
+            interfaces.append({
+                "name": iface,
+                "carrier": carrier,
+                "ip": ip,
+                "internet": internet
+            })
+
+    interfaces.sort(key=lambda x: extract_interface_index(x["name"]))
+    return interfaces
+
+def move_network_file(iface, mode):
+    try:
+        networkd_dir = "/etc/systemd/network"
+        files = os.listdir(networkd_dir)
+
+        # Match any static file for this iface
+        pattern = re.compile(r"(\d+)-(%s)-static\.network" % re.escape(iface))
+        static_file = next((f for f in files if pattern.match(f)), None)
+        if not static_file:
+            print(f"⚠️ No static .network file found for {iface}")
+            return
+
+        src = os.path.join(networkd_dir, static_file)
+        desired_prefix = "02" if mode == "static" else "20"
+        dst_file = f"{desired_prefix}-{iface}-static.network"
+        dst = os.path.join(networkd_dir, dst_file)
+
+        if static_file == dst_file:
+            print(f"✅ Interface {iface} is already set to {mode.upper()}. No changes made.")
+        else:
+            print(f"🔧 Changing mode of {iface} to {mode.upper()}...")
+            subprocess.run(["sudo", "mv", src, dst], check=True)
+
+        # Modify content only if going to static
+        if mode == "static":
+            # Read as normal user
+            with open(dst, "r") as f:
+                lines = f.readlines()
+            cleaned = [line for line in lines if "KernelCommandLine=!netcfg=dhcp" not in line]
+
+            # Only write if change is needed
+            if len(cleaned) != len(lines):
+                temp_path = f"/tmp/{iface}-static.network"
+                with open(temp_path, "w") as tmpf:
+                    tmpf.writelines(cleaned)
+                subprocess.run(["sudo", "cp", temp_path, dst], check=True)
+                os.remove(temp_path)
+                print(f"✂️ Removed KernelCommandLine override from {dst_file}")
+            else:
+                print(f"✅ No KernelCommandLine override found — file already clean.")
+
+        # Restart networkd
+        subprocess.run(["sudo", "systemctl", "restart", "systemd-networkd"])
+        time.sleep(2)
+    except Exception as e:
+        print(f"❌ Unable to change configuration, error: {e}")
+
+def get_gateway_for_interface(ip):
+    """Guess the gateway from the IP address, assuming .1 is the router."""
+    if ip == "IP Not Assigned":
+        return None
+    parts = ip.split('.')
+    parts[-1] = "1"
+    return ".".join(parts)
+
+def populate_resolv_conf(dns_server="8.8.8.8"):
+    """
+    Use sudo to write a DNS entry into /etc/resolv.conf even if not running as root.
+    """
+    content = f"nameserver {dns_server}\n"
+
+    try:
+        # Write using echo and sudo tee
+        cmd = f"echo '{content.strip()}' | sudo tee /etc/resolv.conf > /dev/null"
+        result = subprocess.run(cmd, shell=True, check=True)
+        print(f"✅ /etc/resolv.conf updated with nameserver {dns_server}")
+    except subprocess.CalledProcessError as e:
+        print(f"❌ Failed to update /etc/resolv.conf: {e}")
+
+def set_default_route(iface, ip):
+    gateway = get_gateway_for_interface(ip)
+    if not gateway:
+        print(f"❌ Cannot set default route — IP not assigned for {iface}")
+        return
+
+    print(f"🔧 Setting default route via {iface} ({gateway})")
+
+    try:
+        # Delete all existing default routes
+        subprocess.run(["sudo", "/sbin/ip", "route", "del", "default"], check=False)
+
+        # Add new default route for this iface
+        subprocess.run(
+            ["sudo", "/sbin/ip", "route", "add", "default", "via", gateway, "dev", iface],
+            check=True
+        )
+        print(f"✅ Default route set via {iface} ({gateway})")
+    except subprocess.CalledProcessError:
+        print(f"❌ Failed to set default route via {iface}")
+
+def network_menu():
+    if not is_sima_board():
+        print("❌ This command only runs on the DevKit")
+        return
+
+    while True:
+        interfaces = get_interfaces()
+        choices = ["🚪 Quit Menu"]
+        iface_map = {}
+
+        for iface in interfaces:
+            status_icon = "carrier (✅)" if iface["carrier"] else "carrier (❌)"
+            internet_icon = "internet (🌐)" if iface.get("internet") else "internet (🚫)"
+            label = f"{iface['name']:<10} {status_icon} {internet_icon}  {iface['ip']:<20}"
+            choices.append(label)
+            iface_map[label] = iface
+
+        try:
+            iface_choice = inquirer.fuzzy(
+                message="Select Ethernet Interface:",
+                choices=choices,
+                instruction="(Type or use ↑↓)",
+            ).execute()
+        except KeyboardInterrupt:
+            print("\nExiting.")
+            break
+
+        if iface_choice is None or iface_choice == "🚪 Quit Menu":
+            print("Exiting.")
+            break
+
+        selected_iface = iface_map[iface_choice]
+
+        try:
+            second = inquirer.select(
+                message=f"Configure {selected_iface['name']}:",
+                choices=[
+                    "Set to DHCP",
+                    "Set to Default Static IP",
+                    "Set as Default Route",
+                    "Back to Interface Selection"
+                ]
+            ).execute()
+        except KeyboardInterrupt:
+            print("\nExiting.")
+            break
+
+        if second == "Set to DHCP":
+            move_network_file(selected_iface["name"], "dhcp")
+            populate_resolv_conf()
+        elif second == "Set to Default Static IP":
+            move_network_file(selected_iface["name"], "static")
+        elif second == "Set as Default Route":
+            set_default_route(selected_iface["name"], selected_iface["ip"])            
+        else:
+            continue 
+
+if __name__ == '__main__':
+    network_menu()

sima_cli/nvme/nvme.py

@@ -0,0 +1,123 @@
+import subprocess
+import click
+from sima_cli.utils.env import is_modalix_devkit
+
+def scan_nvme():
+    try:
+        nvme_list = subprocess.check_output("sudo nvme list", shell=True, text=True).strip()
+        if "/dev/nvme0n1" in nvme_list:
+            return nvme_list
+    except subprocess.CalledProcessError:
+        pass
+    return None
+
+def get_lba_format_index():
+    try:
+        lba_output = subprocess.check_output("sudo nvme id-ns -H /dev/nvme0n1 | grep 'Relative Performance'", shell=True, text=True)
+        lbaf_line = lba_output.strip().split(":")[0]
+        lbaf_index = lbaf_line.split()[-1]
+        return lbaf_index
+    except Exception:
+        return None
+
+def format_nvme(lbaf_index):
+    cmds = [
+        f"sudo nvme format /dev/nvme0n1 --lbaf={lbaf_index}",
+        "sudo parted -a optimal /dev/nvme0n1 mklabel gpt",
+        "sudo parted -a optimal /dev/nvme0n1 mkpart primary ext4 0% 100%",
+        "sudo mkfs.ext4 /dev/nvme0n1p1",
+        "sudo nvme smart-log -H /dev/nvme0n1"
+    ]
+    for cmd in cmds:
+        subprocess.run(cmd, shell=True, check=True)
+
+def add_nvme_to_fstab():
+    """
+    Add /dev/nvme0n1p1 to /etc/fstab for persistent mounting at /mnt/nvme.
+    Only appends if the entry does not already exist.
+    Requires root permission to modify /etc/fstab.
+    """
+    fstab_path = "/etc/fstab"
+    nvme_entry = "/dev/nvme0n1p1  /mnt/nvme  ext4  defaults  0  2"
+
+    try:
+        # Check if the entry already exists
+        with open(fstab_path, "r") as f:
+            for line in f:
+                if "/dev/nvme0n1p1" in line or "/mnt/nvme" in line:
+                    click.echo("ℹ️  NVMe mount entry already exists in /etc/fstab.")
+                    return
+
+        # Append the entry as sudo
+        append_cmd = f"echo '{nvme_entry}' | sudo tee -a {fstab_path} > /dev/null"
+        subprocess.run(append_cmd, shell=True, check=True)
+        click.echo("✅ /etc/fstab updated to include NVMe auto-mount.")
+    except Exception as e:
+        click.echo(f"❌ Failed to update /etc/fstab: {e}")
+
+def mount_nvme():
+    try:
+        # Create mount point
+        subprocess.run("sudo mkdir -p /mnt/nvme", shell=True, check=True)
+
+        # Mount the NVMe partition
+        subprocess.run("sudo mount /dev/nvme0n1p1 /mnt/nvme", shell=True, check=True)
+
+        add_nvme_to_fstab()
+
+        subprocess.run("sudo mount -a", shell=True, check=True)
+        
+        # Change ownership to user 'sima'
+        subprocess.run("sudo chown sima:sima /mnt/nvme", shell=True, check=True)
+
+        subprocess.run("sudo chmod 755 /mnt/nvme", shell=True, check=True)
+
+
+        print("✅ NVMe mounted and write permission granted to user 'sima'.")
+
+    except subprocess.CalledProcessError as e:
+        print(f"❌ Error during NVMe mount: {e}")
+
+def nvme_format():
+    if not is_modalix_devkit():
+        click.echo("❌  This command can only be run on the Modalix DevKit.")
+        return
+
+    nvme_info = scan_nvme()
+    if not nvme_info:
+        click.echo("❌  No NVMe drive detected.")
+        return
+    click.echo(nvme_info)
+
+    lbaf_index = get_lba_format_index()
+    if lbaf_index is None:
+        click.echo("❌  Failed to detect LBA format index.")
+        return
+    click.echo(f"ℹ️  Detected LBA format index: {lbaf_index}")
+
+    if not click.confirm("⚠️  Are you sure you want to format /dev/nvme0n1? This will erase all data."):
+        click.echo("❌ Aborted by user.")
+        return
+
+    try:
+        # Unmount before formatting, ignore error if not mounted
+        subprocess.run("sudo umount /mnt/nvme", shell=True, check=False)
+
+        # Format and mount
+        format_nvme(lbaf_index)
+        mount_nvme()
+        click.echo("✅  NVMe drive formatted and mounted at /mnt/nvme.")
+    except subprocess.CalledProcessError:
+        click.echo("❌ Formatting process failed.")
+
+
+def nvme_remount():
+    if not is_modalix_devkit():
+        click.echo("❌ This command can only be run on the Modalix DevKit.")
+        return
+
+    try:
+        mount_nvme()
+
+    except subprocess.CalledProcessError as e:
+        raise RuntimeError(f"Failed to remount NVMe: {e}")

sima_cli/update/bootimg.py

@@ -5,8 +5,8 @@ import sys
 import os
 import select
 import re
-import threading
-from tftpy import TftpServer
+
+from sima_cli.update.updater import download_image
 
 try:
     from tqdm import tqdm
@@ -299,7 +299,7 @@ def write_bootimg(image_path):
         click.echo("ℹ️  Please manually eject the device.")
 
 
-def write_image(version: str, board: str, swtype: str, internal: bool = False):
+def write_image(version: str, board: str, swtype: str, internal: bool = False, flavor: str = 'headless'):
     """
     Download and write a bootable firmware image to a removable storage device.
 
@@ -308,13 +308,14 @@ def write_image(version: str, board: str, swtype: str, internal: bool = False):
         board (str): Target board type, e.g., "modalix" or "mlsoc".
         swtype (str): Software image type, e.g., "yocto" or "exlr".
         internal (bool): Whether to use internal download sources. Defaults to False.
+        flavor (str): Flavor of the software package - can be either headless or full.
 
     Raises:
         RuntimeError: If the download or write process fails.
     """
     try:
         click.echo(f"⬇️  Downloading boot image for version: {version}, board: {board}, swtype: {swtype}")
-        file_list = download_image(version, board, swtype, internal, update_type='bootimg')
+        file_list = download_image(version, board, swtype, internal, update_type='bootimg', flavor=flavor)
         if not isinstance(file_list, list):
             raise ValueError("Expected list of extracted files, got something else.")
 

sima_cli/update/local.py

@@ -73,7 +73,7 @@ def get_local_board_info() -> Tuple[str, str]:
     return board_type, build_version
 
 
-def push_and_update_local_board(troot_path: str, palette_path: str, passwd: str):
+def push_and_update_local_board(troot_path: str, palette_path: str, passwd: str, flavor: str):
     """
     Perform local firmware update using swupdate commands.
     Calls swupdate directly on the provided file paths.
@@ -82,15 +82,17 @@ def push_and_update_local_board(troot_path: str, palette_path: str, passwd: str)
 
     try:
         # Run tRoot update
-        click.echo("⚙️  Flashing tRoot image...")
-        if not _run_local_cmd(f"sudo swupdate -H simaai-image-troot:1.0 -i {troot_path}", passwd):
-            click.echo("❌ tRoot update failed.")
-            return
-        click.echo("✅ tRoot update completed.")
-
+        if troot_path != None:
+            click.echo("⚙️  Flashing tRoot image...")
+            if not _run_local_cmd(f"sudo swupdate -H simaai-image-troot:1.0 -i {troot_path}", passwd):
+                click.echo("❌ tRoot update failed.")
+                return
+            click.echo("✅ tRoot update completed.")
+            
         # Run Palette update
         click.echo("⚙️  Flashing System image...")
-        if not _run_local_cmd(f"sudo swupdate -H simaai-image-palette:1.0 -i {palette_path}", passwd):
+        _flavor = 'palette' if flavor == 'headless' else 'graphics'
+        if not _run_local_cmd(f"sudo swupdate -H simaai-image-{_flavor}:1.0 -i {palette_path}", passwd):
             click.echo("❌ System image update failed.")
             return
         click.echo("✅ System image update completed. Please powercycle the device")

sima_cli/update/netboot.py

@@ -127,7 +127,7 @@ class ClientManager:
 
             while not self.shutdown_event.is_set():
                 try:
-                    board_type, build_version = get_remote_board_info(ip)
+                    board_type, build_version, _ = get_remote_board_info(ip)
 
                     if board_type and build_version:
                         with self.lock:
@@ -346,7 +346,7 @@ def run_cli(client_manager):
             click.echo("\n🛑 Exiting netboot session.")
             return True
 
-def setup_netboot(version: str, board: str, internal: bool = False, autoflash: bool = False):
+def setup_netboot(version: str, board: str, internal: bool = False, autoflash: bool = False, flavor: str = 'headless'):
     """
     Download and serve a bootable image for network boot over TFTP with client monitoring.
 
@@ -355,6 +355,7 @@ def setup_netboot(version: str, board: str, internal: bool = False, autoflash: b
         board (str): Target board type, e.g., "modalix" or "davinci".
         internal (bool): Whether to use internal download sources. Defaults to False.
         autoflash (bool): Whether to automatically flash the devkit when networked booted. Defaults to False.
+        flavor (str): The software flavor, can be either headless or full.
 
     Raises:
         RuntimeError: If the download or TFTP setup fails.
@@ -367,7 +368,7 @@ def setup_netboot(version: str, board: str, internal: bool = False, autoflash: b
 
     try:
         click.echo(f"⬇️ Downloading netboot image for version: {version}, board: {board}")
-        file_list = download_image(version, board, swtype="yocto", internal=internal, update_type='netboot')
+        file_list = download_image(version, board, swtype="yocto", internal=internal, update_type='netboot', flavor=flavor)
         if not isinstance(file_list, list):
             raise ValueError("Expected list of extracted files, got something else.")
         extract_dir = os.path.dirname(file_list[0])

sima_cli/update/query.py

@@ -5,7 +5,7 @@ from sima_cli.utils.config import get_auth_token
 
 ARTIFACTORY_BASE_URL = artifactory_url() + '/artifactory'
 
-def _list_available_firmware_versions_internal(board: str, match_keyword: str = None):
+def _list_available_firmware_versions_internal(board: str, match_keyword: str = None, flavor: str = 'headless'):
     fw_path = f"{board}" 
     aql_query = f"""
                 items.find({{
@@ -46,7 +46,7 @@ def _list_available_firmware_versions_internal(board: str, match_keyword: str =
 
     return top_level_folders
 
-def _list_available_firmware_versions_external(board: str, match_keyword: str = None):
+def _list_available_firmware_versions_external(board: str, match_keyword: str = None, flavor: str = 'headless'):
     """
     Construct and return a list containing a single firmware download URL for a given board.
     
@@ -56,6 +56,7 @@ def _list_available_firmware_versions_external(board: str, match_keyword: str =
     Args:
         board (str): The name of the hardware board.
         match_keyword (str, optional): A version string to match (e.g., '1.6' or '1.6.0').
+        flavor (str, optional): A string indicating firmware flavor - headless or full.
 
     Returns:
         list[str]: A list containing one formatted firmware download URL.
@@ -75,7 +76,7 @@ def _list_available_firmware_versions_external(board: str, match_keyword: str =
     return [firmware_download_url]
 
 
-def list_available_firmware_versions(board: str, match_keyword: str = None, internal: bool = False):
+def list_available_firmware_versions(board: str, match_keyword: str = None, internal: bool = False, flavor: str = 'headless'):
     """
     Public interface to list available firmware versions.
 
@@ -83,11 +84,12 @@ def list_available_firmware_versions(board: str, match_keyword: str = None, inte
     - board: str – Name of the board (e.g. 'davinci')
     - match_keyword: str – Optional keyword to filter versions (case-insensitive)
     - internal: bool – Must be True to access internal Artifactory
+    - flavor (str, optional): A string indicating firmware flavor - headless or full.
 
     Returns:
     - List[str] of firmware version folder names, or None if access is not allowed
     """
     if not internal:
-        return _list_available_firmware_versions_external(board, match_keyword)
+        return _list_available_firmware_versions_external(board, match_keyword, flavor)
 
-    return _list_available_firmware_versions_internal(board, match_keyword)
+    return _list_available_firmware_versions_internal(board, match_keyword, flavor)

sima_cli/update/remote.py

@@ -51,41 +51,51 @@ def _wait_for_ssh(ip: str, timeout: int = 120):
     else:
         print("\r✅ Board is online!           \n")
 
-def get_remote_board_info(ip: str, passwd: str = DEFAULT_PASSWORD) -> Tuple[str, str]:
+def get_remote_board_info(ip: str, passwd: str = DEFAULT_PASSWORD) -> Tuple[str, str, str]:
     """
-    Connect to the remote board and retrieve board type and build version.
+    Connect to the remote board and retrieve board type, build version, and fdt_name.
 
     Args:
         ip (str): IP address of the board.
 
     Returns:
-        (board_type, build_version): Tuple of strings, or ('', '') on failure.
+        (board_type, build_version, fdt_name): Tuple of strings, or ('', '', '') on failure.
     """
     board_type = ""
     build_version = ""
+    fdt_name = ""
 
     try:
         ssh = paramiko.SSHClient()
         ssh.set_missing_host_key_policy(paramiko.AutoAddPolicy())
         ssh.connect(ip, username=DEFAULT_USER, password=passwd, timeout=10)
 
-        # Try /etc/build first then /etc/buildinfo
+        # Retrieve build info
         stdin, stdout, stderr = ssh.exec_command("cat /etc/build 2>/dev/null || cat /etc/buildinfo 2>/dev/null")
-        output = stdout.read().decode()
+        build_output = stdout.read().decode()
+
+        # Retrieve fdt_name from fw_printenv
+        stdin, stdout, stderr = ssh.exec_command("fw_printenv fdt_name 2>/dev/null")
+        fdt_output = stdout.read().decode()
+
         ssh.close()
 
-        for line in output.splitlines():
+        for line in build_output.splitlines():
             line = line.strip()
             if line.startswith("MACHINE"):
                 board_type = line.split("=", 1)[-1].strip()
             elif line.startswith("SIMA_BUILD_VERSION"):
                 build_version = line.split("=", 1)[-1].strip()
 
-        return board_type, build_version
+        for line in fdt_output.splitlines():
+            if line.startswith("fdt_name"):
+                fdt_name = line.split("=", 1)[-1].strip()
+
+        return board_type, build_version, fdt_name
 
     except Exception as e:
         click.echo(f"Unable to retrieve board info with error: {e}, board may be still booting.")
-        return "", ""
+        return "", "", ""
 
 
 def _scp_file(sftp, local_path: str, remote_path: str):
@@ -187,7 +197,7 @@ def copy_file_to_remote_board(ip: str, file_path: str, remote_dir: str, passwd:
 
     return False
 
-def push_and_update_remote_board(ip: str, troot_path: str, palette_path: str, passwd: str, reboot_and_wait: bool):
+def push_and_update_remote_board(ip: str, troot_path: str, palette_path: str, passwd: str, reboot_and_wait: bool, flavor: str = 'headless'):
     """
     Upload and install firmware images to remote board over SSH.
     Assumes default credentials: sima / edgeai.
@@ -200,21 +210,24 @@ def push_and_update_remote_board(ip: str, troot_path: str, palette_path: str, pa
         ssh.connect(ip, username=DEFAULT_USER, password=passwd, timeout=10)
         sftp = ssh.open_sftp()
         remote_dir = "/tmp"
-
-        # Upload tRoot image
-        troot_name = os.path.basename(troot_path)
         palette_name = os.path.basename(palette_path)
-        _scp_file(sftp, troot_path, os.path.join(remote_dir, troot_name))
-        click.echo("🚀 Uploaded tRoot image.")
 
-        # Run tRoot update
-        run_remote_command(
-            ssh,
-            f"sudo swupdate -H simaai-image-troot:1.0 -i /tmp/{troot_name}", password=passwd
-        )
-        click.echo("✅ tRoot update complete, the board needs to be rebooted to proceed to the next phase of update.")
-        click.confirm("⚠️  Have you rebooted the board?", default=True, abort=True)
-        _wait_for_ssh(ip, timeout=120)
+        # Upload tRoot image
+        if troot_path is not None:
+            troot_name = os.path.basename(troot_path)
+            _scp_file(sftp, troot_path, os.path.join(remote_dir, troot_name))
+            click.echo("🚀 Uploaded tRoot image.")
+
+            # Run tRoot update
+            run_remote_command(
+                ssh,
+                f"sudo swupdate -H simaai-image-troot:1.0 -i /tmp/{troot_name}", password=passwd
+            )
+            click.echo("✅ tRoot update complete, the board needs to be rebooted to proceed to the next phase of update.")
+            click.confirm("⚠️  Have you rebooted the board?", default=True, abort=True)
+            _wait_for_ssh(ip, timeout=120)
+        else:
+            click.echo("⚠️  tRoot update skipped because the requested image doesn't contain troot image.")
 
         # Upload Palette image
         ssh.connect(ip, username=DEFAULT_USER, password=passwd, timeout=10)
@@ -223,13 +236,22 @@ def push_and_update_remote_board(ip: str, troot_path: str, palette_path: str, pa
         click.echo("🚀 Uploaded system image.")
 
         # Run Palette update
+        _flavor = 'palette' if flavor == 'headless' else 'graphics'
         run_remote_command(
             ssh,
-            f"sudo swupdate -H simaai-image-palette:1.0 -i /tmp/{palette_name}",
+            f"sudo swupdate -H simaai-image-{_flavor}:1.0 -i /tmp/{palette_name}",
             password=passwd
         )
         click.echo("✅ Board image update complete.")
 
+        if _flavor == 'graphics':
+            click.echo(f"⚠️  With full image, setting U-Boot environment variable to support NVMe and GPU.")
+            run_remote_command(
+                ssh,
+                f"sudo fw_setenv dtbos pcie-4rc-2rc-2rc.dtbo",
+                password=passwd
+            )
+
         # In the case of PCIe system, we don't need to reboot the card, instead, we will let it finish then update the PCIe driver in the host
         # After that we can reboot the whole system.
         if reboot_and_wait:
@@ -237,8 +259,7 @@ def push_and_update_remote_board(ip: str, troot_path: str, palette_path: str, pa
             click.echo("🔁 Rebooting board after update. Waiting for reconnection...")
 
             try:
-                run_remote_command(ssh, "sudo systemctl stop watchdog", password=passwd)
-                run_remote_command(ssh, "sudo bash -c 'echo b > /proc/sysrq-trigger'", password=passwd)
+                run_remote_command(ssh, "sudo reboot", password=passwd)
 
             except Exception as reboot_err:
                 click.echo(f"⚠️  SSH connection lost due to reboot (expected): {reboot_err}, please powercycle the board...")