mchusandClaude Sonnet 5
9c5c29239c
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's78d1b9bfollow-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 from78d1b9bnow 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>
91 lines
3.4 KiB
Bash
Executable File
91 lines
3.4 KiB
Bash
Executable File
#!/bin/sh
|
|
# 9000-bee-setup.hook.chroot — runs inside Debian chroot during live-build
|
|
# Enables bee systemd services and configures the live environment.
|
|
set -e
|
|
|
|
echo "=== bee chroot setup ==="
|
|
|
|
GPU_VENDOR=$(cat /etc/bee-gpu-vendor 2>/dev/null || echo nvidia)
|
|
echo "=== GPU vendor: ${GPU_VENDOR} ==="
|
|
|
|
ensure_bee_console_user() {
|
|
if id bee >/dev/null 2>&1; then
|
|
usermod -d /home/bee -s /bin/bash bee 2>/dev/null || true
|
|
else
|
|
useradd -d /home/bee -m -s /bin/bash -U bee
|
|
fi
|
|
|
|
mkdir -p /home/bee
|
|
chown -R bee:bee /home/bee
|
|
echo "bee:eeb" | chpasswd
|
|
groupadd -f ipmi 2>/dev/null || true
|
|
usermod -aG sudo,video,input,render,ipmi bee 2>/dev/null || true
|
|
}
|
|
|
|
ensure_bee_console_user
|
|
|
|
# Enable common bee services
|
|
systemctl enable bee-hpc-tuning.service
|
|
systemctl enable bee-network.service
|
|
systemctl enable bee-preflight.service
|
|
systemctl enable bee-audit.service
|
|
systemctl enable bee-web.service
|
|
systemctl enable bee-sshsetup.service
|
|
systemctl enable bee-blackbox.service
|
|
systemctl enable bee-selfheal.timer
|
|
systemctl enable bee-boot-status.service
|
|
systemctl enable ssh.service
|
|
systemctl enable lightdm.service 2>/dev/null || true
|
|
systemctl enable qemu-guest-agent.service 2>/dev/null || true
|
|
systemctl enable serial-getty@ttyS0.service 2>/dev/null || true
|
|
systemctl enable serial-getty@ttyS1.service 2>/dev/null || true
|
|
systemctl enable bee-journal-mirror@ttyS1.service 2>/dev/null || true
|
|
|
|
# Enable GPU-vendor specific services
|
|
if [ "$GPU_VENDOR" = "nvidia" ]; then
|
|
systemctl enable nvidia-dcgm.service 2>/dev/null || true
|
|
systemctl enable nvidia-fabricmanager.service 2>/dev/null || true
|
|
systemctl enable bee-nvidia.service
|
|
elif [ "$GPU_VENDOR" = "amd" ]; then
|
|
# ROCm symlinks (packages install to /opt/rocm-*/bin/)
|
|
for tool in rocm-smi rocm-bandwidth-test rvs; do
|
|
if [ ! -e /usr/local/bin/${tool} ]; then
|
|
bin_path="$(find /opt -path "*/bin/${tool}" -type f 2>/dev/null | sort | tail -1)"
|
|
[ -n "${bin_path}" ] && ln -sf "${bin_path}" /usr/local/bin/${tool}
|
|
fi
|
|
done
|
|
fi
|
|
# nogpu: no GPU services needed
|
|
|
|
# Ensure scripts are executable
|
|
chmod +x /usr/local/bin/bee-hpc-tuning 2>/dev/null || true
|
|
chmod +x /usr/local/bin/bee-network.sh 2>/dev/null || true
|
|
chmod +x /usr/local/bin/bee-sshsetup 2>/dev/null || true
|
|
chmod +x /usr/local/bin/bee-smoketest 2>/dev/null || true
|
|
chmod +x /usr/local/bin/bee 2>/dev/null || true
|
|
chmod +x /usr/local/bin/bee-log-run 2>/dev/null || true
|
|
chmod +x /usr/local/bin/bee-selfheal 2>/dev/null || true
|
|
chmod +x /usr/local/bin/bee-boot-status 2>/dev/null || true
|
|
chmod +x /usr/local/bin/bee-install 2>/dev/null || true
|
|
chmod +x /usr/local/bin/bee-gui-gate 2>/dev/null || true
|
|
chmod +x /usr/local/bin/bee-remount-medium 2>/dev/null || true
|
|
chmod +x /usr/local/bin/bee-check-nvswitch 2>/dev/null || true
|
|
if [ "$GPU_VENDOR" = "nvidia" ]; then
|
|
chmod +x /usr/local/bin/bee-nvidia-load 2>/dev/null || true
|
|
chmod +x /usr/local/bin/bee-gpu-burn 2>/dev/null || true
|
|
chmod +x /usr/local/bin/bee-john-gpu-stress 2>/dev/null || true
|
|
chmod +x /usr/local/bin/bee-nccl-gpu-stress 2>/dev/null || true
|
|
fi
|
|
|
|
# Reload udev rules
|
|
udevadm control --reload-rules 2>/dev/null || true
|
|
|
|
# Create export directory
|
|
mkdir -p /appdata/bee/export
|
|
|
|
if [ -f /etc/sudoers.d/bee ]; then
|
|
chmod 0440 /etc/sudoers.d/bee
|
|
fi
|
|
|
|
echo "=== bee chroot setup complete (${GPU_VENDOR}) ==="
|