clonebox 1.1.7__py3-none-any.whl → 1.1.9__py3-none-any.whl

clonebox/cli.py

@@ -93,22 +93,30 @@ def _resolve_vm_name_and_config_file(name: Optional[str]) -> Tuple[str, Optional
 def _qga_ping(vm_name: str, conn_uri: str) -> bool:
     import subprocess
     import json
+    import time
 
     try:
-        result = subprocess.run(
-            [
-                "virsh",
-                "--connect",
-                conn_uri,
-                "qemu-agent-command",
-                vm_name,
-                json.dumps({"execute": "guest-ping"}),
-            ],
-            capture_output=True,
-            text=True,
-            timeout=5,
-        )
-        return result.returncode == 0
+        for _ in range(5):
+            try:
+                result = subprocess.run(
+                    [
+                        "virsh",
+                        "--connect",
+                        conn_uri,
+                        "qemu-agent-command",
+                        vm_name,
+                        json.dumps({"execute": "guest-ping"}),
+                    ],
+                    capture_output=True,
+                    text=True,
+                    timeout=5,
+                )
+                if result.returncode == 0:
+                    return True
+            except subprocess.TimeoutExpired:
+                pass
+            time.sleep(1)
+        return False
     except Exception:
         return False
 
@@ -1656,6 +1664,7 @@ def cmd_test(args):
     """Test VM configuration and health."""
     import subprocess
     import json
+    import time
     from clonebox.validator import VMValidator
 
     name = args.name
@@ -1735,6 +1744,15 @@ def cmd_test(args):
         if state == "running":
             console.print("[green]✅ VM is running[/]")
 
+            # Give QEMU Guest Agent some time to come up (common during early boot)
+            qga_ready = _qga_ping(vm_name, conn_uri)
+            if not qga_ready:
+                for _ in range(12):  # ~60s
+                    time.sleep(5)
+                    qga_ready = _qga_ping(vm_name, conn_uri)
+                    if qga_ready:
+                        break
+
             # Test network if running
             console.print("\n   Checking network...")
             try:
@@ -1753,11 +1771,7 @@ def cmd_test(args):
                 else:
                     console.print("[yellow]⚠️  No IP address detected via virsh domifaddr[/]")
                     # Fallback: try to get IP via QEMU Guest Agent (useful for slirp/user networking)
-                    try:
-                        from .cli import _qga_ping, _qga_exec
-                    except ImportError:
-                        from clonebox.cli import _qga_ping, _qga_exec
-                    if _qga_ping(vm_name, conn_uri):
+                    if qga_ready:
                         try:
                             ip_out = _qga_exec(
                                 vm_name,
@@ -1789,61 +1803,22 @@ def cmd_test(args):
     if not quick and state == "running":
         console.print("[bold]3. Cloud-init Status[/]")
         try:
-            # Try to get cloud-init status via QEMU guest agent
-            result = subprocess.run(
-                [
-                    "virsh",
-                    "--connect",
-                    conn_uri,
-                    "qemu-agent-command",
-                    vm_name,
-                    '{"execute":"guest-exec","arguments":{"path":"cloud-init","arg":["status"],"capture-output":true}}',
-                ],
-                capture_output=True,
-                text=True,
-                timeout=15,
-            )
-            if result.returncode == 0:
-                try:
-                    response = json.loads(result.stdout)
-                    if "return" in response:
-                        pid = response["return"]["pid"]
-                        # Get output
-                        result2 = subprocess.run(
-                            [
-                                "virsh",
-                                "--connect",
-                                conn_uri,
-                                "qemu-agent-command",
-                                vm_name,
-                                f'{{"execute":"guest-exec-status","arguments":{"pid":{pid}}}}',
-                            ],
-                            capture_output=True,
-                            text=True,
-                            timeout=15,
-                        )
-                        if result2.returncode == 0:
-                            resp2 = json.loads(result2.stdout)
-                            if "return" in resp2 and resp2["return"]["exited"]:
-                                output = resp2["return"]["out-data"]
-                                if output:
-                                    import base64
-
-                                    status = base64.b64decode(output).decode()
-                                    if "done" in status.lower():
-                                        console.print("[green]✅ Cloud-init completed[/]")
-                                    elif "running" in status.lower():
-                                        console.print("[yellow]⚠️  Cloud-init still running[/]")
-                                    else:
-                                        console.print(
-                                            f"[yellow]⚠️  Cloud-init status: {status.strip()}[/]"
-                                        )
-                except:
-                    pass
-        except:
-            console.print(
-                "[yellow]⚠️  Could not check cloud-init (QEMU agent may not be running)[/]"
-            )
+            if not qga_ready:
+                console.print("[yellow]⚠️  Cloud-init status unknown (QEMU Guest Agent not connected)[/]")
+            else:
+                status = _qga_exec(vm_name, conn_uri, "cloud-init status 2>/dev/null || true", timeout=15)
+                if status is None:
+                    console.print("[yellow]⚠️  Could not check cloud-init (QGA command failed)[/]")
+                elif "done" in status.lower():
+                    console.print("[green]✅ Cloud-init completed[/]")
+                elif "running" in status.lower():
+                    console.print("[yellow]⚠️  Cloud-init still running[/]")
+                elif status.strip():
+                    console.print(f"[yellow]⚠️  Cloud-init status: {status.strip()}[/]")
+                else:
+                    console.print("[yellow]⚠️  Cloud-init status: unknown[/]")
+        except Exception:
+            console.print("[yellow]⚠️  Could not check cloud-init (QEMU agent may not be running)[/]")
 
     console.print()
 
@@ -1878,25 +1853,31 @@ def cmd_test(args):
     if not quick and state == "running":
         console.print("[bold]5. Health Check[/]")
         try:
-            result = subprocess.run(
-                [
-                    "virsh",
-                    "--connect",
-                    conn_uri,
-                    "qemu-agent-command",
-                    vm_name,
-                    '{"execute":"guest-exec","arguments":{"path":"/usr/local/bin/clonebox-health","capture-output":true}}',
-                ],
-                capture_output=True,
-                text=True,
-                timeout=60,
-            )
-            if result.returncode == 0:
-                console.print("[green]✅ Health check triggered[/]")
-                console.print("   View results in VM: cat /var/log/clonebox-health.log")
+            if not qga_ready:
+                console.print("[yellow]⚠️  QEMU Guest Agent not connected - cannot run health check[/]")
             else:
-                console.print("[yellow]⚠️  Health check script not found[/]")
-                console.print("   VM may not have been created with health checks")
+                exists = _qga_exec(
+                    vm_name,
+                    conn_uri,
+                    "test -x /usr/local/bin/clonebox-health && echo yes || echo no",
+                    timeout=10,
+                )
+                if exists and exists.strip() == "yes":
+                    out = _qga_exec(
+                        vm_name,
+                        conn_uri,
+                        "/usr/local/bin/clonebox-health >/dev/null 2>&1 && echo yes || echo no",
+                        timeout=60,
+                    )
+                    if out and out.strip() == "yes":
+                        console.print("[green]✅ Health check ran successfully[/]")
+                        console.print("   View results in VM: cat /var/log/clonebox-health.log")
+                    else:
+                        console.print("[yellow]⚠️  Health check did not report success[/]")
+                        console.print("   View logs in VM: cat /var/log/clonebox-health.log")
+                else:
+                    console.print("[yellow]⚠️  Health check script not found[/]")
+                    console.print("   This is expected until cloud-init completes")
         except Exception as e:
             console.print(f"[yellow]⚠️  Could not run health check: {e}[/]")
 
@@ -2745,9 +2726,22 @@ def cmd_exec(args) -> None:
     vm_name, config_file = _resolve_vm_name_and_config_file(args.name)
     conn_uri = "qemu:///session" if getattr(args, "user", False) else "qemu:///system"
     command = args.command
+    if isinstance(command, list):
+        command = " ".join(command).strip()
+    if not command:
+        console.print("[red]❌ No command specified[/]")
+        return
     timeout = getattr(args, "timeout", 30)
 
-    if not _qga_ping(vm_name, conn_uri):
+    qga_ready = _qga_ping(vm_name, conn_uri)
+    if not qga_ready:
+        for _ in range(12):  # ~60s
+            time.sleep(5)
+            qga_ready = _qga_ping(vm_name, conn_uri)
+            if qga_ready:
+                break
+
+    if not qga_ready:
         console.print(f"[red]❌ Cannot connect to VM '{vm_name}' via QEMU Guest Agent[/]")
         console.print("[dim]Make sure the VM is running and qemu-guest-agent is installed.[/]")
         return
@@ -3488,7 +3482,9 @@ def main():
     exec_parser.add_argument(
         "name", nargs="?", default=None, help="VM name or '.' to use .clonebox.yaml"
     )
-    exec_parser.add_argument("command", help="Command to execute in VM")
+    exec_parser.add_argument(
+        "command", nargs=argparse.REMAINDER, help="Command to execute in VM"
+    )
     exec_parser.add_argument(
         "-u", "--user", action="store_true", help="Use user session (qemu:///session)"
     )

clonebox/cloner.py

@@ -433,7 +433,13 @@ class SelectiveVMCloner:
 
                 # Create cloud-init ISO if packages/services specified
                 cloudinit_iso = None
-                if config.packages or config.services:
+                if (
+                    config.packages
+                    or config.services
+                    or config.snap_packages
+                    or config.post_commands
+                    or config.gui
+                ):
                     cloudinit_iso = ctx.add_file(self._create_cloudinit_iso(vm_dir, config))
                     log.info(f"Created cloud-init ISO with {len(config.packages)} packages")
 
@@ -623,8 +629,11 @@ class SelectiveVMCloner:
             ET.SubElement(devices, "input", type="tablet", bus="usb")
             ET.SubElement(devices, "input", type="keyboard", bus="usb")
 
+        ET.SubElement(devices, "controller", type="virtio-serial", index="0")
+
         # Channel for guest agent
         channel = ET.SubElement(devices, "channel", type="unix")
+        ET.SubElement(channel, "source", mode="bind")
         ET.SubElement(channel, "target", type="virtio", name="org.qemu.guest_agent.0")
 
         # Memory balloon
@@ -1247,15 +1256,30 @@ fi
         cloudinit_dir.mkdir(exist_ok=True)
 
         # Meta-data
-        meta_data = f"instance-id: {config.name}\nlocal-hostname: {config.name}\n"
+        instance_id = f"{config.name}-{uuid.uuid4().hex}"
+        meta_data = f"instance-id: {instance_id}\nlocal-hostname: {config.name}\n"
         (cloudinit_dir / "meta-data").write_text(meta_data)
 
         # Generate mount commands and fstab entries for 9p filesystems
         mount_commands = []
         fstab_entries = []
         all_paths = dict(config.paths) if config.paths else {}
+        pre_chown_dirs: set[str] = set()
         for idx, (host_path, guest_path) in enumerate(all_paths.items()):
             if Path(host_path).exists():
+                if str(guest_path).startswith("/home/ubuntu/snap/"):
+                    guest_parts = Path(guest_path).parts
+                    if len(guest_parts) > 4:
+                        snap_name = guest_parts[4]
+                        for d in (
+                            "/home/ubuntu",
+                            "/home/ubuntu/snap",
+                            f"/home/ubuntu/snap/{snap_name}",
+                        ):
+                            if d not in pre_chown_dirs:
+                                pre_chown_dirs.add(d)
+                                mount_commands.append(f"  - mkdir -p {d}")
+                                mount_commands.append(f"  - chown 1000:1000 {d}")
                 tag = f"mount{idx}"
                 # Use uid=1000,gid=1000 to give ubuntu user access to mounts
                 # mmap allows proper file mapping
@@ -1306,6 +1330,9 @@ fi
         for cmd in mount_commands:
             runcmd_lines.append(cmd)
 
+        runcmd_lines.append("  - chown -R 1000:1000 /home/ubuntu || true")
+        runcmd_lines.append("  - chown -R 1000:1000 /home/ubuntu/snap || true")
+
         # Install snap packages
         if config.snap_packages:
             runcmd_lines.append("  - echo 'Installing snap packages...'")
@@ -2146,7 +2173,7 @@ if __name__ == "__main__":
                 "  - cp -r /var/log/clonebox*.log /mnt/logs/var/log/ 2>/dev/null || true",
                 "  - cp -r /tmp/*-error.log /mnt/logs/tmp/ 2>/dev/null || true",
                 "  - echo 'Logs disk mounted at /mnt/logs - accessible from host as /var/lib/libvirt/images/clonebox-logs.qcow2'",
-                "  - echo 'To view logs on host: sudo mount -o loop /var/lib/libvirt/images/clonebox-logs.qcow2 /mnt/clonebox-logs'",
+                "  - \"echo 'To view logs on host: sudo mount -o loop /var/lib/libvirt/images/clonebox-logs.qcow2 /mnt/clonebox-logs'\"",
             ]
         )
 
@@ -2158,9 +2185,7 @@ if __name__ == "__main__":
         runcmd_yaml = "\n".join(runcmd_lines) if runcmd_lines else ""
         
         # Build bootcmd combining mount commands and extra security bootcmds
-        bootcmd_lines = list(mount_commands) if mount_commands else []
-        if bootcmd_extra:
-            bootcmd_lines.extend(bootcmd_extra)
+        bootcmd_lines = list(bootcmd_extra) if bootcmd_extra else []
             
         bootcmd_block = ""
         if bootcmd_lines:

{clonebox-1.1.7.dist-info → clonebox-1.1.9.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: clonebox
-Version: 1.1.7
+Version: 1.1.9
 Summary: Clone your workstation environment to an isolated VM with selective apps, paths and services
 Author: CloneBox Team
 License: Apache-2.0

{clonebox-1.1.7.dist-info → clonebox-1.1.9.dist-info}/RECORD

@@ -1,7 +1,7 @@
 clonebox/__init__.py,sha256=CyfHVVq6KqBr4CNERBpXk_O6Q5B35q03YpdQbokVvvI,408
 clonebox/__main__.py,sha256=Fcoyzwwyz5-eC_sBlQk5a5RbKx8uodQz5sKJ190U0NU,135
-clonebox/cli.py,sha256=KR3naqYB1ZRFDGGoQAfqRk4Ci4NVF3WiY3nOzRKmcyg,136362
-clonebox/cloner.py,sha256=aH7BwmLgPITHzyHn_n_AKqtEADDm_aUXiRG-nB2rxMQ,90063
+clonebox/cli.py,sha256=VZ1K0z0jLbqrEakXR4pC9d4FVTvzLiyzuOff3S0s2gg,136214
+clonebox/cloner.py,sha256=7JzouMKoqNQ2AYKA2HL4hk0jIDeaWh2b0mV1UW6nwD0,91267
 clonebox/container.py,sha256=tiYK1ZB-DhdD6A2FuMA0h_sRNkUI7KfYcJ0tFOcdyeM,6105
 clonebox/dashboard.py,sha256=dMY6odvPq3j6FronhRRsX7aY3qdCwznB-aCWKEmHDNw,5768
 clonebox/detector.py,sha256=vS65cvFNPmUBCX1Y_TMTnSRljw6r1Ae9dlVtACs5XFc,23075
@@ -34,9 +34,9 @@ clonebox/snapshots/manager.py,sha256=hGzM8V6ZJPXjTqj47c4Kr8idlE-c1Q3gPUvuw1HvS1A
 clonebox/snapshots/models.py,sha256=sRnn3OZE8JG9FZJlRuA3ihO-JXoPCQ3nD3SQytflAao,6206
 clonebox/templates/profiles/ml-dev.yaml,sha256=w07MToGh31xtxpjbeXTBk9BkpAN8A3gv8HeA3ESKG9M,461
 clonebox/templates/profiles/web-stack.yaml,sha256=EBnnGMzML5vAjXmIUbCpbTCwmRaNJiuWd3EcL43DOK8,485
-clonebox-1.1.7.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-clonebox-1.1.7.dist-info/METADATA,sha256=ojWCleuifB5DP3QDwjgT-X45ge_SslR30e7CyHl8iwY,48915
-clonebox-1.1.7.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
-clonebox-1.1.7.dist-info/entry_points.txt,sha256=FES95Vi3btfViLEEoHdb8nikNxTqzaooi9ehZw9ZfWI,47
-clonebox-1.1.7.dist-info/top_level.txt,sha256=LdMo2cvCrEcRGH2M8JgQNVsCoszLV0xug6kx1JnaRjo,9
-clonebox-1.1.7.dist-info/RECORD,,
+clonebox-1.1.9.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+clonebox-1.1.9.dist-info/METADATA,sha256=UjgHC8vzL5OL-yr1WP4XB0KAAacblP6YNiKsD9zWpa8,48915
+clonebox-1.1.9.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
+clonebox-1.1.9.dist-info/entry_points.txt,sha256=FES95Vi3btfViLEEoHdb8nikNxTqzaooi9ehZw9ZfWI,47
+clonebox-1.1.9.dist-info/top_level.txt,sha256=LdMo2cvCrEcRGH2M8JgQNVsCoszLV0xug6kx1JnaRjo,9
+clonebox-1.1.9.dist-info/RECORD,,