Merge branch 'lukeshu/misc'

2 files changed, 15 insertions, 2 deletions

diff --git a/scripts/main.sh b/scripts/main.sh
index dddb9bb..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,13 +67,20 @@ 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 \
-    inspect rebuild-trees --node-list=$gendir/0.nodes.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 \
     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
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"