From 6b8c24fb78f0face6532c1170ff0dca46dd56223 Mon Sep 17 00:00:00 2001
From: Luke Shumaker <lukeshu@lukeshu.com>
Date: Sat, 1 Apr 2023 21:10:35 -0600
Subject: cmd/btrfs-rec: Have RebuiltForrest be opt-in on the CLI

---
 scripts/main.sh  | 1 +
 scripts/mount.sh | 1 +
 2 files changed, 2 insertions(+)

(limited to 'scripts')

diff --git a/scripts/main.sh b/scripts/main.sh
index dddb9bb..1e143eb 100755
--- a/scripts/main.sh
+++ b/scripts/main.sh
@@ -68,6 +68,7 @@ run-btrfs-rec $gendir/3.trees.json \
 
 run-btrfs-rec $gendir/4.ls-files.txt \
     --mappings=$gendir/2.mappings.json \
+    --rebuild \
     inspect ls-files
 run-btrfs-rec $gendir/4.ls-trees.txt \
     --mappings=$gendir/2.mappings.json \
diff --git a/scripts/mount.sh b/scripts/mount.sh
index bf84163..4894e94 100755
--- a/scripts/mount.sh
+++ b/scripts/mount.sh
@@ -15,6 +15,7 @@ mkdir -p "$mountpoint"
 sudo ./bin/btrfs-rec \
      --pv="$image"
      --mappings="$gendir/2.mappings.json" \
+     --rebuild \
      inspect mount \
      --skip-filesums \
      "$mountpoint"
-- 
cgit v1.2.3-2-g168b


From 5d2729a4e15dca6e22187cd5de272a2a2d191131 Mon Sep 17 00:00:00 2001
From: Luke Shumaker <lukeshu@lukeshu.com>
Date: Fri, 10 Mar 2023 19:31:50 -0700
Subject: cmd/btrfs-rec: Move --node-list to be a global flag

---
 scripts/main.sh | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'scripts')

diff --git a/scripts/main.sh b/scripts/main.sh
index 1e143eb..d86e984 100755
--- a/scripts/main.sh
+++ b/scripts/main.sh
@@ -64,7 +64,8 @@ run-btrfs-rec $gendir/2.mappings.json \
 
 run-btrfs-rec $gendir/3.trees.json \
     --mappings=$gendir/2.mappings.json \
-    inspect rebuild-trees --node-list=$gendir/0.nodes.json
+    --node-list=$gendir/0.nodes.json \
+    inspect rebuild-trees
 
 run-btrfs-rec $gendir/4.ls-files.txt \
     --mappings=$gendir/2.mappings.json \
@@ -72,4 +73,5 @@ run-btrfs-rec $gendir/4.ls-files.txt \
     inspect ls-files
 run-btrfs-rec $gendir/4.ls-trees.txt \
     --mappings=$gendir/2.mappings.json \
-    inspect ls-trees --node-list=$gendir/0.nodes.json
+    --node-list=$gendir/0.nodes.json \
+    inspect ls-trees
-- 
cgit v1.2.3-2-g168b


From 848a8def00e531a25233bb5550dfba35faa303a5 Mon Sep 17 00:00:00 2001
From: Luke Shumaker <lukeshu@lukeshu.com>
Date: Mon, 3 Apr 2023 20:57:19 -0600
Subject: scripts/main.sh: Add more comments

---
 scripts/main.sh | 9 +++++++++
 1 file changed, 9 insertions(+)

(limited to 'scripts')

diff --git a/scripts/main.sh b/scripts/main.sh
index d86e984..c5fc238 100755
--- a/scripts/main.sh
+++ b/scripts/main.sh
@@ -31,10 +31,15 @@ export GOMEMLIMIT="$(awk '/^MemTotal:/{ print $2 "KiB" }' </proc/meminfo)"
 
 ######################################################################
 
+# 0: initial scan ##########################################
+
 run-btrfs-rec $gendir/0.scandevices.json \
     inspect rebuild-mappings scan
 run-btrfs-rec $gendir/0.nodes.json \
     inspect rebuild-mappings list-nodes $gendir/0.scandevices.json
+
+# 1-2: rebuild chunk/dev-ext/blockgroup trees ##############
+
 run-btrfs-rec $gendir/1.mappings.json \
     inspect rebuild-mappings process $gendir/0.scandevices.json
 
@@ -62,11 +67,15 @@ run-btrfs-rec $gendir/2.mappings.json \
       -e '2a{"LAddr":13631488,"PAddr":{"Dev":1,"Addr":13631488},"Size":1},') \
     inspect rebuild-mappings process $gendir/0.scandevices.json
 
+# 3: rebuild other trees ###################################
+
 run-btrfs-rec $gendir/3.trees.json \
     --mappings=$gendir/2.mappings.json \
     --node-list=$gendir/0.nodes.json \
     inspect rebuild-trees
 
+# 4: dump data from the FS #################################
+
 run-btrfs-rec $gendir/4.ls-files.txt \
     --mappings=$gendir/2.mappings.json \
     --rebuild \
-- 
cgit v1.2.3-2-g168b