5cd9b496fd
- Switch nix from single-user to daemon mode (trusted-users = root live); Void socket at /var/nix/daemon-socket/socket confirmed - Fix lightdm autologin: use session-wrapper=/etc/lightdm/Xsession (Void lightdm 1.32 has no lightdm-session binary) - Fix session env: LIBGL_ALWAYS_SOFTWARE=1 via profile.d (session-env= is unsupported in this lightdm version) - GPU auto-detection at boot: VIRT→software GL, NVIDIA PRIME offload, Intel/AMD/generic→modesetting - Add nix-daemon to live runsvdir/default; remove unsupported -S mklive flag - first-login.sh: install Claude Code + nix user packages (google-chrome, spotify, discord, localsend, mission-center) + NVM/node + VS Code exts - build-live-iso.sh: write nix-packages.list from NIX_USER_PACKAGES - postinstall.sh: fix nix-daemon socket path to /var/nix/daemon-socket/socket - Dockerfile: add dconf-cli for build-time dconf compile - _inner-build-live.sh: use correct 'dconf compile' API (not 'dconf update') - .gitignore: add build/live-includes/ (generated staging tree) - docs/LIVE_ISO.md: document all findings, gotchas and architecture
69 lines
2.3 KiB
Bash
Executable File
69 lines
2.3 KiB
Bash
Executable File
#!/bin/bash
|
|
# Runs INSIDE the docker container (as root). Invoked by iso/build-live-iso.sh.
|
|
# Expects the project bind-mounted at /work and the cache at /cache.
|
|
#
|
|
# Required env (set by build-live-iso.sh):
|
|
# ARCH, REPO_URL, KEYMAP, LOCALE, ISO_PKGS, ISO_TITLE, OUT_ISO_REL,
|
|
# INCLUDE_DIR_REL
|
|
|
|
set -Eeuo pipefail
|
|
|
|
: "${ARCH:?}"; : "${REPO_URL:?}"; : "${KEYMAP:?}"; : "${LOCALE:?}"
|
|
: "${ISO_PKGS:?}"; : "${ISO_TITLE:?}"; : "${OUT_ISO_REL:?}"
|
|
: "${INCLUDE_DIR_REL:?}"
|
|
|
|
CACHE_DIR=/cache
|
|
PROJECT_DIR=/work
|
|
MKLIVE_DIR="$CACHE_DIR/void-mklive"
|
|
INCLUDE_DIR="$PROJECT_DIR/$INCLUDE_DIR_REL"
|
|
OUT_ISO="$PROJECT_DIR/$OUT_ISO_REL"
|
|
|
|
export PATH="$CACHE_DIR/xbps-static/usr/bin:$PATH"
|
|
|
|
[[ -d "$MKLIVE_DIR" ]] || { echo "ERROR: $MKLIVE_DIR missing"; exit 1; }
|
|
[[ -d "$INCLUDE_DIR" ]] || { echo "ERROR: $INCLUDE_DIR missing"; exit 1; }
|
|
command -v xbps-install.static >/dev/null \
|
|
|| { echo "ERROR: xbps-install.static not on PATH"; exit 1; }
|
|
|
|
mkdir -p "$(dirname "$OUT_ISO")"
|
|
|
|
# Compile dconf system-db inside the include dir so it ships compiled.
|
|
# Debian's dconf-cli provides 'dconf compile <output_db> <keyfile_dir>'.
|
|
if command -v dconf >/dev/null 2>&1 && [[ -d "$INCLUDE_DIR/etc/dconf/db/local.d" ]]; then
|
|
dconf compile "$INCLUDE_DIR/etc/dconf/db/local" \
|
|
"$INCLUDE_DIR/etc/dconf/db/local.d" 2>/dev/null \
|
|
&& echo "dconf: compiled system-db/local" \
|
|
|| echo "dconf: compile failed (non-fatal)"
|
|
fi
|
|
|
|
cd "$MKLIVE_DIR"
|
|
|
|
_cleanup_mklive_builds() {
|
|
local d sub
|
|
for d in "$MKLIVE_DIR"/mklive-build.*/; do
|
|
[[ -d "$d" ]] || continue
|
|
for sub in tmp-rootfs/sys tmp-rootfs/proc tmp-rootfs/dev tmp-rootfs/run \
|
|
image/rootfs/sys image/rootfs/proc image/rootfs/dev image/rootfs/run; do
|
|
[[ -d "$d$sub" ]] && umount -R --lazy "$d$sub" 2>/dev/null || true
|
|
done
|
|
rm -rf "$d" 2>/dev/null || true
|
|
done
|
|
}
|
|
trap _cleanup_mklive_builds EXIT
|
|
|
|
./mklive.sh \
|
|
-a "$ARCH" \
|
|
-r "$REPO_URL" \
|
|
-r "${REPO_URL%/current}/current/nonfree" \
|
|
-c "$CACHE_DIR/xbps-live-pkgs" \
|
|
-H "$CACHE_DIR/xbps-host-pkgs" \
|
|
-k "$KEYMAP" \
|
|
-l "$LOCALE" \
|
|
-T "$ISO_TITLE" \
|
|
-p "$ISO_PKGS" \
|
|
-I "$INCLUDE_DIR" \
|
|
-C "${BOOT_CMDLINE:-}" \
|
|
-o "$OUT_ISO"
|
|
|
|
chown "$(stat -c '%u:%g' "$PROJECT_DIR")" "$OUT_ISO" "${OUT_ISO}".* 2>/dev/null || true
|