clonebox 1.1.8__tar.gz → 1.1.10__tar.gz

{clonebox-1.1.8/src/clonebox.egg-info → clonebox-1.1.10}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: clonebox
-Version: 1.1.8
+Version: 1.1.10
 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.8 → clonebox-1.1.10}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "clonebox"
-version = "1.1.8"
+version = "1.1.10"
 description = "Clone your workstation environment to an isolated VM with selective apps, paths and services"
 readme = "README.md"
 license = {text = "Apache-2.0"}

{clonebox-1.1.8 → clonebox-1.1.10}/src/clonebox/cli.py

@@ -2724,16 +2724,73 @@ def cmd_monitor(args) -> None:
 def cmd_exec(args) -> None:
     """Execute command in VM via QEMU Guest Agent."""
     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()
+    user_session = getattr(args, "user", False)
+    timeout = getattr(args, "timeout", 30)
+
+    # When using argparse.REMAINDER for `command`, any flags placed after the VM name
+    # may end up inside args.command. Recover common exec flags from the remainder.
+    command_tokens = args.command
+    if not isinstance(command_tokens, list):
+        command_tokens = [str(command_tokens)] if command_tokens is not None else []
+
+    if "--" in command_tokens:
+        sep_idx = command_tokens.index("--")
+        pre_tokens = command_tokens[:sep_idx]
+        post_tokens = command_tokens[sep_idx + 1 :]
+    else:
+        pre_tokens = command_tokens
+        post_tokens = []
+
+    i = 0
+    while i < len(pre_tokens):
+        tok = pre_tokens[i]
+        if tok in ("-u", "--user"):
+            user_session = True
+            i += 1
+            continue
+        if tok in ("-t", "--timeout"):
+            if i + 1 < len(pre_tokens):
+                try:
+                    timeout = int(pre_tokens[i + 1])
+                except ValueError:
+                    pass
+                i += 2
+                continue
+        break
+
+    remaining_pre = pre_tokens[i:]
+    if post_tokens:
+        command_tokens = remaining_pre + post_tokens
+    else:
+        command_tokens = remaining_pre
+
+    command = " ".join(command_tokens).strip()
     if not command:
         console.print("[red]❌ No command specified[/]")
         return
-    timeout = getattr(args, "timeout", 30)
 
-    if not _qga_ping(vm_name, conn_uri):
+    conn_uri = "qemu:///session" if user_session else "qemu:///system"
+    other_conn_uri = "qemu:///system" if conn_uri == "qemu:///session" else "qemu:///session"
+
+    qga_ready = _qga_ping(vm_name, conn_uri)
+    if not qga_ready:
+        alt_ready = _qga_ping(vm_name, other_conn_uri)
+        if alt_ready:
+            conn_uri = other_conn_uri
+            qga_ready = True
+    if not qga_ready:
+        for _ in range(12):  # ~60s
+            time.sleep(5)
+            qga_ready = _qga_ping(vm_name, conn_uri)
+            if not qga_ready:
+                alt_ready = _qga_ping(vm_name, other_conn_uri)
+                if alt_ready:
+                    conn_uri = other_conn_uri
+                    qga_ready = True
+            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

{clonebox-1.1.8 → clonebox-1.1.10}/src/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")
 
@@ -1250,7 +1256,8 @@ 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
@@ -1260,25 +1267,33 @@ fi
         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}")
+                # Ensure all parent directories in /home/ubuntu are owned by user
+                # This prevents "Permission denied" when creating config dirs (e.g. .config) as root
+                if str(guest_path).startswith("/home/ubuntu/"):
+                    try:
+                        rel_path = Path(guest_path).relative_to("/home/ubuntu")
+                        current = Path("/home/ubuntu")
+                        # Create and chown each component in the path
+                        for part in rel_path.parts:
+                            current = current / part
+                            d_str = str(current)
+                            if d_str not in pre_chown_dirs:
+                                pre_chown_dirs.add(d_str)
+                                mount_commands.append(f"  - mkdir -p {d_str}")
+                                mount_commands.append(f"  - chown 1000:1000 {d_str}")
+                    except ValueError:
+                        pass
+
                 tag = f"mount{idx}"
                 # Use uid=1000,gid=1000 to give ubuntu user access to mounts
                 # mmap allows proper file mapping
                 mount_opts = "trans=virtio,version=9p2000.L,mmap,uid=1000,gid=1000,users"
-                mount_commands.append(f"  - mkdir -p {guest_path}")
-                mount_commands.append(f"  - chown 1000:1000 {guest_path}")
+                
+                # Ensure target exists and is owned by user (if not already handled)
+                if str(guest_path) not in pre_chown_dirs:
+                    mount_commands.append(f"  - mkdir -p {guest_path}")
+                    mount_commands.append(f"  - chown 1000:1000 {guest_path}")
+
                 mount_commands.append(f"  - mount -t 9p -o {mount_opts} {tag} {guest_path} || true")
                 # Add fstab entry for persistence after reboot
                 fstab_entries.append(f"{tag} {guest_path} 9p {mount_opts},nofail 0 0")
@@ -1323,16 +1338,37 @@ fi
         for cmd in mount_commands:
             runcmd_lines.append(cmd)
 
+        # Create user directories with correct permissions EARLY to avoid race conditions with GDM
+        if config.gui:
+            # Create directories that GNOME services need
+            runcmd_lines.extend(
+                [
+                    "  - mkdir -p /home/ubuntu/.config/pulse /home/ubuntu/.cache/ibus /home/ubuntu/.local/share",
+                    "  - mkdir -p /home/ubuntu/.config/dconf /home/ubuntu/.cache/tracker3",
+                    "  - mkdir -p /home/ubuntu/.config/autostart",
+                    "  - chown -R 1000:1000 /home/ubuntu/.config /home/ubuntu/.cache /home/ubuntu/.local",
+                    "  - chmod 700 /home/ubuntu/.config /home/ubuntu/.cache",
+                    "  - systemctl set-default graphical.target",
+                    "  - systemctl enable gdm3 || systemctl enable gdm || true",
+                ]
+            )
+
         runcmd_lines.append("  - chown -R 1000:1000 /home/ubuntu || true")
         runcmd_lines.append("  - chown -R 1000:1000 /home/ubuntu/snap || true")
 
-        # Install snap packages
+        # Install snap packages (with retry logic)
         if config.snap_packages:
             runcmd_lines.append("  - echo 'Installing snap packages...'")
             for snap_pkg in config.snap_packages:
-                runcmd_lines.append(
-                    f"  - snap install {snap_pkg} --classic || snap install {snap_pkg} || true"
+                # Try classic first, then strict, with retries
+                cmd = (
+                    f"for i in 1 2 3; do "
+                    f"snap install {snap_pkg} --classic && break || "
+                    f"snap install {snap_pkg} && break || "
+                    f"sleep 10; "
+                    f"done"
                 )
+                runcmd_lines.append(f"  - {cmd}")
 
             # Connect snap interfaces for GUI apps (not auto-connected via cloud-init)
             runcmd_lines.append("  - echo 'Connecting snap interfaces...'")
@@ -1345,22 +1381,8 @@ fi
 
             runcmd_lines.append("  - systemctl restart snapd || true")
 
-        # Add GUI setup if enabled - runs AFTER package installation completes
+        # Add remaining GUI setup if enabled
         if config.gui:
-            # Create directories that GNOME services need BEFORE GUI starts
-            # These may conflict with mounted host directories, so ensure they exist with correct perms
-            runcmd_lines.extend(
-                [
-                    "  - mkdir -p /home/ubuntu/.config/pulse /home/ubuntu/.cache/ibus /home/ubuntu/.local/share",
-                    "  - mkdir -p /home/ubuntu/.config/dconf /home/ubuntu/.cache/tracker3",
-                    "  - mkdir -p /home/ubuntu/.config/autostart",
-                    "  - chown -R 1000:1000 /home/ubuntu/.config /home/ubuntu/.cache /home/ubuntu/.local",
-                    "  - chmod 700 /home/ubuntu/.config /home/ubuntu/.cache",
-                    "  - systemctl set-default graphical.target",
-                    "  - systemctl enable gdm3 || systemctl enable gdm || true",
-                ]
-            )
-
             # Create autostart entries for GUI apps
             autostart_apps = {
                 "pycharm-community": (

{clonebox-1.1.8 → clonebox-1.1.10}/src/clonebox/validator.py

@@ -897,6 +897,23 @@ class VMValidator:
             self.results["overall"] = "qga_not_ready"
             return self.results
 
+        ci_status = self._exec_in_vm("cloud-init status --long 2>/dev/null || cloud-init status 2>/dev/null || true", timeout=20)
+        if ci_status:
+            ci_lower = ci_status.lower()
+            if "running" in ci_lower:
+                self.console.print("[yellow]⏳ Cloud-init still running - skipping deep validation for now[/]")
+                self.results["overall"] = "cloud_init_running"
+                return self.results
+
+        ready_msg = self._exec_in_vm(
+            "cat /var/log/clonebox-ready 2>/dev/null || true",
+            timeout=10,
+        )
+        if not (ready_msg and "clonebox vm ready" in ready_msg.lower()):
+            self.console.print(
+                "[yellow]⚠️  CloneBox ready marker not found - provisioning may not have completed[/]"
+            )
+
         # Run all validations
         self.validate_mounts()
         self.validate_packages()

{clonebox-1.1.8 → clonebox-1.1.10/src/clonebox.egg-info}/PKG-INFO

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