parrot-blackbox 2.0.0 → 2.0.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "parrot-blackbox",
-  "version": "2.0.0",
+  "version": "2.0.1",
   "description": "Crash-proof, multi-cloud backup & recovery automation for Parrot OS. Daily/weekly off-disk backups with automatic catch-up, smart storage across many MEGA + Google Drive accounts, Timeshift snapshot backups and one-command restore.",
   "type": "module",
   "main": "src/cli.js",

package/src/backup/btrfs-send.js

@@ -58,6 +58,21 @@ export async function getBtrfsDevice(mountPoint = '/') {
   }
 }
 
+/**
+ * Check if a path is actually a BTRFS subvolume (not just a directory on BTRFS).
+ * @param {string} path
+ * @returns {Promise<boolean>}
+ */
+export async function isSubvolume(path) {
+  try {
+    // Need sudo to check subvolume info
+    const res = await execa('sudo', ['-n', 'btrfs', 'subvolume', 'show', path], { reject: false });
+    return res.exitCode === 0;
+  } catch {
+    return false;
+  }
+}
+
 /**
  * Set a BTRFS subvolume to read-only mode (required for send).
  * @param {string} subvolPath - Path to the subvolume
@@ -66,6 +81,12 @@ export async function getBtrfsDevice(mountPoint = '/') {
  * @returns {Promise<void>}
  */
 export async function setSubvolumeReadOnly(subvolPath, readOnly = true, { privileged = 'noninteractive' } = {}) {
+  // First verify it's actually a subvolume
+  const isSubvol = await isSubvolume(subvolPath);
+  if (!isSubvol) {
+    throw new Error(`${subvolPath} is not a BTRFS subvolume`);
+  }
+  
   const roValue = readOnly ? 'true' : 'false';
   const args = ['btrfs', 'property', 'set', '-ts', subvolPath, 'ro', roValue];
   const res = await sudoExec(args, { privileged });

package/src/backup/snapshot.js

@@ -401,19 +401,24 @@ export async function runSnapshotBackup(cfg, state, { due, privileged = 'noninte
 /**
  * Upload a snapshot using BTRFS send/receive streaming.
  * Creates: btrfs send [-p parent] | zstd | [openssl] | rclone rcat (chunked)
+ * 
+ * Note: For BTRFS send to work, we need to use paths that btrfs recognizes as subvolumes.
+ * On most Parrot systems, snapshots are at: /timeshift-btrfs/snapshots/<name>
+ * We construct the proper subvolume path rather than using potentially-mounted paths.
  */
 async function uploadViaBtrfsSend({ snapshot, snapshotDir, parentSnapshot, parentDir, accounts, cfg, due, privileged, onProgress }) {
-  const { setSubvolumeReadOnly, createSendStream, estimateSendSize } = await import('./btrfs-send.js');
+  const { createSendStream, estimateSendSize } = await import('./btrfs-send.js');
   const { planAndPlaceStream } = await import('../storage/allocator.js');
   
-  // Ensure snapshot is read-only
-  try {
-    await setSubvolumeReadOnly(snapshotDir, true, { privileged });
-  } catch (e) {
-    console.log(`⚠ Could not set snapshot read-only: ${e.message}`);
-  }
-
-  // Estimate size for progress reporting
+  // Construct the actual subvolume path for BTRFS send
+  // Timeshift stores snapshots at /timeshift-btrfs/snapshots/<name> on the root BTRFS volume
+  // We need to use this path for btrfs send, not any temporarily mounted paths
+  const subvolPath = `/timeshift-btrfs/snapshots/${snapshot.name}`;
+  const parentSubvolPath = parentSnapshot ? `/timeshift-btrfs/snapshots/${parentSnapshot.name}` : null;
+  
+  journal('snapshots', `using subvolume path: ${subvolPath}`);
+  
+  // Estimate size for progress reporting (use original snapshotDir for filesystem operations)
   const estimatedSize = await estimateSendSize(snapshotDir, { parent: parentDir });
   const btrfsCfg = cfg.jobs.snapshots.btrfs || {};
   
@@ -422,8 +427,8 @@ async function uploadViaBtrfsSend({ snapshot, snapshotDir, parentSnapshot, paren
   if (btrfsCfg.compression) console.log(`   Compression: zstd enabled`);
   if (btrfsCfg.encryption && cfg.storage.encryptionPassphrase) console.log(`   Encryption: AES-256 enabled`);
 
-  // Create the BTRFS send stream
-  const sendStream = await createSendStream(snapshotDir, { parent: parentDir, privileged });
+  // Create the BTRFS send stream using the actual subvolume paths
+  const sendStream = await createSendStream(subvolPath, { parent: parentSubvolPath, privileged });
 
   // Build the pipeline: btrfs send -> [zstd] -> [openssl] -> chunked rclone rcat
   const { spawn } = await import('node:child_process');