fix(iso): let empty directories survive the squashfs layer split

bee_layer_classify only ever tracked regular files and symlinks (`find ... -type f -o -type l`), so any directory that is empty at build time — like /var/log/nvidia-dcgm, correctly created and chowned by the datacenter-gpu-manager postinst — was silently dropped from every layer's rsync --files-from list and never reached the built ISO. This is why bbc6fb1's 78d1b9b follow-up (seeding a marker file just for that one path) kept the directory alive: it was a targeted workaround for a general gap in the classifier, not a fix of it. Replace that workaround with the general mechanism: classify also walks every directory, computes the subset that is empty all the way down (no file or symlink anywhere in its subtree — a directory that does hold files needs no entry, rsync already recreates it as an implied parent), and assigns each one to a layer via the same dpkg-ownership / injected-rule precedence used for files. Add an injected rule routing /var/log/nvidia-dcgm to 20-nvidia-platform, alongside the DCGM binaries that actually use it, instead of letting it fall through to base by default. bee_layer_build folds each layer's empty-dir list into the same rsync --files-from call; recursion into a directory that is by-construction empty copies nothing extra. Revert the 9000/9999 hook changes from 78d1b9b now that they're redundant, and cover the new path with test-squashfs-layers.sh (ruled, unruled, and nested-empty directories, asserted present in the merged rootfs after a real mksquashfs/unsquashfs round-trip). Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
2026-09-12 16:19:36 +03:00
parent 78d1b9b599
commit 9c5c29239c
4 changed files with 73 additions and 35 deletions
@@ -27,9 +27,6 @@ rm -rf /var/lib/apt/lists/*

 # ── Misc ──────────────────────────────────────────────────────────────────────
 rm -rf /tmp/* /var/tmp/* 2>/dev/null || true
-# /var/log/nvidia-dcgm/.keep is intentionally seeded by 9000-bee-setup so an
-# otherwise-empty DCGM_HOME_DIR survives the squashfs layer classifier (which
-# only tracks files/symlinks, not empty directories) — never sweep it up here.
-find /var/log -type f ! -path '/var/log/nvidia-dcgm/.keep' -delete 2>/dev/null || true
+find /var/log -type f -delete 2>/dev/null || true

 echo "=== slim: done ==="