clonebox 1.1.16__py3-none-any.whl → 1.1.17__py3-none-any.whl

clonebox/cloner.py

@@ -1234,9 +1234,9 @@ check_mount() {{
         log "[INFO] Mount point '$path' does not exist yet"
         return 0
     fi
-}
+}}
 
-check_copy_path() {
+check_copy_path() {{
     local path="$1"
     if [ -d "$path" ]; then
         if [ "$(ls -A "$path" 2>/dev/null | wc -l)" -gt 0 ]; then
@@ -1403,7 +1403,7 @@ fi
         (cloudinit_dir / "meta-data").write_text(meta_data)
 
         # Generate mount commands and fstab entries for 9p filesystems
-        mount_commands = []
+        bind_mount_commands = []
         fstab_entries = []
         all_paths = dict(config.paths) if config.paths else {}
         pre_chown_dirs: set[str] = set()
@@ -1421,8 +1421,8 @@ fi
                             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}")
+                                bind_mount_commands.append(f"  - mkdir -p {d_str}")
+                                bind_mount_commands.append(f"  - chown 1000:1000 {d_str}")
                     except ValueError:
                         pass
 
@@ -1433,14 +1433,15 @@ fi
                 
                 # 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}")
+                    bind_mount_commands.append(f"  - mkdir -p {guest_path}")
+                    bind_mount_commands.append(f"  - chown 1000:1000 {guest_path}")
 
-                mount_commands.append(f"  - mount -t 9p -o {mount_opts} {tag} {guest_path} || true")
+                bind_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")
 
         # Handle copy_paths (import then copy)
+        import_mount_commands = []
         all_copy_paths = dict(config.copy_paths) if config.copy_paths else {}
         existing_copy_paths = {h: g for h, g in all_copy_paths.items() if Path(h).exists()}
         
@@ -1451,29 +1452,29 @@ fi
             mount_opts = "trans=virtio,version=9p2000.L,mmap,uid=1000,gid=1000"
 
             # 1. Create temp mount point
-            mount_commands.append(f"  - mkdir -p {temp_mount_point}")
+            import_mount_commands.append(f"  - mkdir -p {temp_mount_point}")
             
             # 2. Mount the 9p share
-            mount_commands.append(f"  - mount -t 9p -o {mount_opts} {tag} {temp_mount_point} || true")
+            import_mount_commands.append(f"  - mount -t 9p -o {mount_opts} {tag} {temp_mount_point} || true")
             
             # 3. Ensure target directory exists and permissions are prepared
             if str(guest_path).startswith("/home/ubuntu/"):
-                mount_commands.append(f"  - mkdir -p {guest_path}")
-                mount_commands.append(f"  - chown 1000:1000 {guest_path}")
+                import_mount_commands.append(f"  - mkdir -p {guest_path}")
+                import_mount_commands.append(f"  - chown 1000:1000 {guest_path}")
             else:
-                mount_commands.append(f"  - mkdir -p {guest_path}")
+                import_mount_commands.append(f"  - mkdir -p {guest_path}")
 
             # 4. Copy contents (cp -rT to copy contents of source to target)
             # We use || true to ensure boot continues even if copy fails
-            mount_commands.append(f"  - echo 'Importing {host_path} to {guest_path}...'")
-            mount_commands.append(f"  - cp -rT {temp_mount_point} {guest_path} || true")
+            import_mount_commands.append(f"  - echo 'Importing {host_path} to {guest_path}...'")
+            import_mount_commands.append(f"  - cp -rT {temp_mount_point} {guest_path} || true")
             
             # 5. Fix ownership recursively
-            mount_commands.append(f"  - chown -R 1000:1000 {guest_path}")
+            import_mount_commands.append(f"  - chown -R 1000:1000 {guest_path}")
 
             # 6. Unmount and cleanup
-            mount_commands.append(f"  - umount {temp_mount_point} || true")
-            mount_commands.append(f"  - rmdir {temp_mount_point} || true")
+            import_mount_commands.append(f"  - umount {temp_mount_point} || true")
+            import_mount_commands.append(f"  - rmdir {temp_mount_point} || true")
 
         # User-data
         # Add desktop environment if GUI is enabled
@@ -1532,14 +1533,21 @@ fi
         runcmd_lines.append("  - echo ''")
 
         # Phase 4: Filesystem mounts
-        runcmd_lines.append(f"  - echo '[4/9] 📁 Mounting shared directories ({len(fstab_entries)} mounts)...'")
+        runcmd_lines.append(f"  - echo '[4/9] 📁 Mounting shared directories ({len(config.paths)} mounts)...'")
+        if bind_mount_commands:
+            for cmd in bind_mount_commands:
+                if "mount -t 9p" in cmd:
+                    # Extract mount point for logging
+                    parts = cmd.split()
+                    mp = parts[-2] if len(parts) > 2 else "path"
+                    runcmd_lines.append(f"  - echo '  → Mounting {mp}...'")
+                runcmd_lines.append(cmd)
+        
         if fstab_entries:
             runcmd_lines.append(
                 "  - grep -q '^# CloneBox 9p mounts' /etc/fstab || echo '# CloneBox 9p mounts' >> /etc/fstab"
             )
             for i, entry in enumerate(fstab_entries, 1):
-                mount_point = entry.split()[1] if len(entry.split()) > 1 else entry
-                runcmd_lines.append(f"  - echo '  → [{i}/{len(fstab_entries)}] {mount_point}'")
                 runcmd_lines.append(
                     f"  - grep -qF \"{entry}\" /etc/fstab || echo '{entry}' >> /etc/fstab"
                 )
@@ -1550,9 +1558,9 @@ fi
         # Phase 5: Data Import (copied paths)
         if existing_copy_paths:
             runcmd_lines.append(f"  - echo '[5/9] 📥 Importing data ({len(existing_copy_paths)} paths)...'")
-            # Add mounts (immediate, before reboot)
+            # Add import commands with progress
             import_count = 0
-            for cmd in mount_commands:
+            for cmd in import_mount_commands:
                 if "Importing" in cmd:
                     import_count += 1
                     runcmd_lines.append(cmd.replace("Importing", f"  → [{import_count}/{len(existing_copy_paths)}] Importing"))

{clonebox-1.1.16.dist-info → clonebox-1.1.17.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: clonebox
-Version: 1.1.16
+Version: 1.1.17
 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.16.dist-info → clonebox-1.1.17.dist-info}/RECORD

@@ -2,7 +2,7 @@ clonebox/__init__.py,sha256=CyfHVVq6KqBr4CNERBpXk_O6Q5B35q03YpdQbokVvvI,408
 clonebox/__main__.py,sha256=Fcoyzwwyz5-eC_sBlQk5a5RbKx8uodQz5sKJ190U0NU,135
 clonebox/audit.py,sha256=1W9vaIjB0A--_p7CgE3cIP5RNckJG1RxJrL-tOb-QmU,14298
 clonebox/cli.py,sha256=k3q-JrzsiDcGPjhzHbm1jPKajxD2chYJxSGGftCbA20,178481
-clonebox/cloner.py,sha256=ZMeIpEuzT8ZO9fav99JdE3krWT6e06K8pBR7XxDKbos,106958
+clonebox/cloner.py,sha256=HI6un0wukNwftO61m2jASbeJ8SiowCEpWMKMb5Qsd8c,107319
 clonebox/container.py,sha256=tiYK1ZB-DhdD6A2FuMA0h_sRNkUI7KfYcJ0tFOcdyeM,6105
 clonebox/dashboard.py,sha256=dMY6odvPq3j6FronhRRsX7aY3qdCwznB-aCWKEmHDNw,5768
 clonebox/detector.py,sha256=vS65cvFNPmUBCX1Y_TMTnSRljw6r1Ae9dlVtACs5XFc,23075
@@ -40,9 +40,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.16.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-clonebox-1.1.16.dist-info/METADATA,sha256=mPn_uTUwAXlnakSJc8DLWyg1KlNERP5-oIEyWABxuwA,49052
-clonebox-1.1.16.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
-clonebox-1.1.16.dist-info/entry_points.txt,sha256=FES95Vi3btfViLEEoHdb8nikNxTqzaooi9ehZw9ZfWI,47
-clonebox-1.1.16.dist-info/top_level.txt,sha256=LdMo2cvCrEcRGH2M8JgQNVsCoszLV0xug6kx1JnaRjo,9
-clonebox-1.1.16.dist-info/RECORD,,
+clonebox-1.1.17.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+clonebox-1.1.17.dist-info/METADATA,sha256=Ns1tp6tNWuGaJWdTEi0BE4MjR7XCmb2LU5n1OZYqeSw,49052
+clonebox-1.1.17.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
+clonebox-1.1.17.dist-info/entry_points.txt,sha256=FES95Vi3btfViLEEoHdb8nikNxTqzaooi9ehZw9ZfWI,47
+clonebox-1.1.17.dist-info/top_level.txt,sha256=LdMo2cvCrEcRGH2M8JgQNVsCoszLV0xug6kx1JnaRjo,9
+clonebox-1.1.17.dist-info/RECORD,,