clonebox 0.1.2__py3-none-any.whl → 0.1.3__py3-none-any.whl

clonebox/cli.py

@@ -492,7 +492,7 @@ def deduplicate_list(items: list, key=None) -> list:
 
 
 def generate_clonebox_yaml(snapshot, detector, deduplicate: bool = True, 
-                           target_path: str = None, vm_name: str = None) -> str:
+                           target_path: str = None, vm_name: str = None, network_mode: str = "auto") -> str:
     """Generate YAML config from system snapshot."""
     sys_info = detector.get_system_info()
     
@@ -559,6 +559,7 @@ def generate_clonebox_yaml(snapshot, detector, deduplicate: bool = True,
             "vcpus": vcpus,
             "gui": True,
             "base_image": None,
+            "network_mode": network_mode,
         },
         "services": services,
         "packages": [
@@ -605,6 +606,7 @@ def create_vm_from_config(config: dict, start: bool = False, user_session: bool
         packages=config.get("packages", []),
         services=config.get("services", []),
         user_session=user_session,
+        network_mode=config["vm"].get("network_mode", "auto"),
     )
     
     cloner = SelectiveVMCloner(user_session=user_session)
@@ -655,7 +657,8 @@ def cmd_clone(args):
         snapshot, detector, 
         deduplicate=args.dedupe,
         target_path=str(target_path),
-        vm_name=vm_name
+        vm_name=vm_name,
+        network_mode=args.network
     )
     
     # Save config file
@@ -863,6 +866,8 @@ def main():
     clone_parser.add_argument("--dedupe", action="store_true", default=True, help="Remove duplicate entries")
     clone_parser.add_argument("--user", "-u", action="store_true", 
                              help="Use user session (qemu:///session) - no root required, stores in ~/.local/share/libvirt/")
+    clone_parser.add_argument("--network", choices=["auto", "default", "user"], default="auto",
+                             help="Network mode: auto (default), default (libvirt network), user (slirp)")
     clone_parser.set_defaults(func=cmd_clone)
     
     args = parser.parse_args()

clonebox/cloner.py

@@ -32,6 +32,7 @@ class VMConfig:
     packages: list = field(default_factory=list)
     services: list = field(default_factory=list)
     user_session: bool = False  # Use qemu:///session instead of qemu:///system
+    network_mode: str = "auto"  # auto|default|user
     
     def to_dict(self) -> dict:
         return {
@@ -91,6 +92,25 @@ class SelectiveVMCloner:
             return self.USER_IMAGES_DIR
         return self.SYSTEM_IMAGES_DIR
     
+    def _default_network_active(self) -> bool:
+        """Check if libvirt default network is active."""
+        try:
+            net = self.conn.networkLookupByName("default")
+            return net.isActive() == 1
+        except libvirt.libvirtError:
+            return False
+    
+    def resolve_network_mode(self, config: VMConfig) -> str:
+        """Resolve network mode based on config and session type."""
+        mode = (config.network_mode or "auto").lower()
+        if mode == "auto":
+            if self.user_session and not self._default_network_active():
+                return "user"
+            return "default"
+        if mode in {"default", "user"}:
+            return mode
+        return "default"
+    
     def check_prerequisites(self) -> dict:
         """Check system prerequisites for VM creation."""
         images_dir = self.get_images_dir()
@@ -123,8 +143,11 @@ class SelectiveVMCloner:
         except libvirt.libvirtError:
             checks["network_error"] = (
                 "Default network not found or inactive.\n"
-                "  Start it with: sudo virsh net-start default\n"
-                "  Or create it: sudo virsh net-define /usr/share/libvirt/networks/default.xml"
+                "  For user session, CloneBox can use user-mode networking (slirp) automatically.\n"
+                "  Or create a user network:\n"
+                "    virsh --connect qemu:///session net-define /tmp/default-network.xml\n"
+                "    virsh --connect qemu:///session net-start default\n"
+                "  Or use system session: clonebox clone . (without --user)\n"
             )
         
         # Check images directory
@@ -215,6 +238,13 @@ class SelectiveVMCloner:
             cloudinit_iso = self._create_cloudinit_iso(vm_dir, config)
             log(f"[cyan]☁️  Created cloud-init ISO with {len(config.packages)} packages[/]")
         
+        # Resolve network mode
+        network_mode = self.resolve_network_mode(config)
+        if network_mode == "user":
+            log("[yellow]⚠️  Using user-mode networking (slirp) because default libvirt network is unavailable[/]")
+        else:
+            log(f"[dim]Network mode: {network_mode}[/]")
+        
         # Generate VM XML
         vm_xml = self._generate_vm_xml(config, root_disk, cloudinit_iso)
         
@@ -288,9 +318,14 @@ class SelectiveVMCloner:
                 ET.SubElement(fs, "target", dir=tag)
         
         # Network interface
-        iface = ET.SubElement(devices, "interface", type="network")
-        ET.SubElement(iface, "source", network="default")
-        ET.SubElement(iface, "model", type="virtio")
+        network_mode = self.resolve_network_mode(config)
+        if network_mode == "user":
+            iface = ET.SubElement(devices, "interface", type="user")
+            ET.SubElement(iface, "model", type="virtio")
+        else:
+            iface = ET.SubElement(devices, "interface", type="network")
+            ET.SubElement(iface, "source", network="default")
+            ET.SubElement(iface, "model", type="virtio")
         
         # Serial console
         serial = ET.SubElement(devices, "serial", type="pty")

{clonebox-0.1.2.dist-info → clonebox-0.1.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: clonebox
-Version: 0.1.2
+Version: 0.1.3
 Summary: Clone your workstation environment to an isolated VM with selective apps, paths and services
 Author: CloneBox Team
 License: Apache-2.0
@@ -65,7 +65,28 @@ CloneBox lets you create isolated virtual machines with only the applications, d
 
 ## Installation
 
-### Prerequisites
+### Quick Setup (Recommended)
+
+Run the setup script to automatically install dependencies and configure the environment:
+
+```bash
+# Clone the repository
+git clone https://github.com/wronai/clonebox.git
+cd clonebox
+
+# Run the setup script
+./setup.sh
+```
+
+The setup script will:
+- Install all required packages (QEMU, libvirt, Python, etc.)
+- Add your user to the necessary groups
+- Configure libvirt networks
+- Install clonebox in development mode
+
+### Manual Installation
+
+#### Prerequisites
 
 ```bash
 # Install libvirt and QEMU/KVM
@@ -82,7 +103,7 @@ newgrp libvirt
 sudo apt install genisoimage
 ```
 
-### Install CloneBox
+#### Install CloneBox
 
 ```bash
 # From source
@@ -296,6 +317,63 @@ clonebox detect --yaml --dedupe -o my-config.yaml
 - Python 3.8+
 - User in `libvirt` group
 
+## Troubleshooting
+
+### Network Issues
+
+If you encounter "Network not found" or "network 'default' is not active" errors:
+
+```bash
+# Run the network fix script
+./fix-network.sh
+
+# Or manually fix:
+virsh --connect qemu:///session net-destroy default 2>/dev/null
+virsh --connect qemu:///session net-undefine default 2>/dev/null
+virsh --connect qemu:///session net-define /tmp/default-network.xml
+virsh --connect qemu:///session net-start default
+```
+
+### Permission Issues
+
+If you get permission errors:
+
+```bash
+# Ensure user is in libvirt and kvm groups
+sudo usermod -aG libvirt $USER
+sudo usermod -aG kvm $USER
+
+# Log out and log back in for groups to take effect
+```
+
+### VM Already Exists
+
+If you get "domain already exists" error:
+
+```bash
+# List VMs
+clonebox list
+
+# Stop and delete the existing VM
+clonebox delete <vm-name>
+
+# Or use virsh directly
+virsh --connect qemu:///session destroy <vm-name>
+virsh --connect qemu:///session undefine <vm-name>
+```
+
+### virt-viewer not found
+
+If GUI doesn't open:
+
+```bash
+# Install virt-viewer
+sudo apt install virt-viewer
+
+# Then connect manually
+virt-viewer --connect qemu:///session <vm-name>
+```
+
 ## License
 
 MIT License - see [LICENSE](LICENSE) file.

clonebox-0.1.3.dist-info/RECORD

@@ -0,0 +1,10 @@
+clonebox/__init__.py,sha256=IOk7G0DiSQ33EGbFC0xbnnFB9aou_6yuyFxvycQEvA0,407
+clonebox/cli.py,sha256=tg_tinIH3D6Q1xAjhXu7P4msl2XcxLo8XUHMDxkOFis,31996
+clonebox/cloner.py,sha256=bB37BFYY7_xlfOSdk05zrUsrw7ewItRBMb7EJkYFA_0,19671
+clonebox/detector.py,sha256=Umg4CRJU61yV3a1AvR_0tOfjBMCCIbiQdDAAhlrOL5k,11916
+clonebox-0.1.3.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+clonebox-0.1.3.dist-info/METADATA,sha256=W6d_Km3nbulNWpl5Z6KctOHciT1o14o4OnAELJMAfbc,11996
+clonebox-0.1.3.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
+clonebox-0.1.3.dist-info/entry_points.txt,sha256=FES95Vi3btfViLEEoHdb8nikNxTqzaooi9ehZw9ZfWI,47
+clonebox-0.1.3.dist-info/top_level.txt,sha256=LdMo2cvCrEcRGH2M8JgQNVsCoszLV0xug6kx1JnaRjo,9
+clonebox-0.1.3.dist-info/RECORD,,

clonebox-0.1.2.dist-info/RECORD

@@ -1,10 +0,0 @@
-clonebox/__init__.py,sha256=IOk7G0DiSQ33EGbFC0xbnnFB9aou_6yuyFxvycQEvA0,407
-clonebox/cli.py,sha256=Zk9D99G2Zcaeb0Pw3eNhv0EtLYKPcpE0GyB3QtuhvgQ,31625
-clonebox/cloner.py,sha256=qfMpx7tS5Eozvhi2ZzBc5GY6HLYotncuMakeknHnTwo,18099
-clonebox/detector.py,sha256=Umg4CRJU61yV3a1AvR_0tOfjBMCCIbiQdDAAhlrOL5k,11916
-clonebox-0.1.2.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-clonebox-0.1.2.dist-info/METADATA,sha256=YtSqXudDO6TrPtAZzbP5fbMvf-PHarUpkY55ZGpHplw,10374
-clonebox-0.1.2.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
-clonebox-0.1.2.dist-info/entry_points.txt,sha256=FES95Vi3btfViLEEoHdb8nikNxTqzaooi9ehZw9ZfWI,47
-clonebox-0.1.2.dist-info/top_level.txt,sha256=LdMo2cvCrEcRGH2M8JgQNVsCoszLV0xug6kx1JnaRjo,9
-clonebox-0.1.2.dist-info/RECORD,,