Fix niri live ISO audio and dark theme setup
This commit is contained in:
@@ -31,6 +31,28 @@ command -v xbps-install.static >/dev/null \
|
|||||||
|
|
||||||
mkdir -p "$(dirname "$OUT_ISO")"
|
mkdir -p "$(dirname "$OUT_ISO")"
|
||||||
|
|
||||||
|
# Compile dconf system-db using Void's own dconf binary inside the target
|
||||||
|
# rootfs. The Niri live builder writes /etc/dconf/db/local.d/01-dark-theme,
|
||||||
|
# but the live system will not report the dark theme unless the GVDB is
|
||||||
|
# compiled into /etc/dconf/db/local (and into skel for the live user).
|
||||||
|
_DCONF_POSTSETUP="$(mktemp -p "$MKLIVE_DIR" postsetup-dconf.XXXXX.sh)"
|
||||||
|
cat > "$_DCONF_POSTSETUP" <<'PSEOF'
|
||||||
|
#!/bin/bash
|
||||||
|
ROOTFS="$1"
|
||||||
|
if [[ -x "$ROOTFS/usr/bin/dconf" ]] && [[ -d "$ROOTFS/etc/dconf/db/local.d" ]]; then
|
||||||
|
chroot "$ROOTFS" dconf compile /etc/dconf/db/local /etc/dconf/db/local.d \
|
||||||
|
&& echo "postsetup: system-db compiled ($(chroot "$ROOTFS" dconf --version 2>/dev/null))" \
|
||||||
|
|| echo "postsetup: system-db compile failed (non-fatal)"
|
||||||
|
mkdir -p "$ROOTFS/etc/skel/.config/dconf"
|
||||||
|
chroot "$ROOTFS" dconf compile /etc/skel/.config/dconf/user /etc/dconf/db/local.d \
|
||||||
|
&& echo "postsetup: skel user dconf db compiled" \
|
||||||
|
|| echo "postsetup: skel user dconf db compile failed (non-fatal)"
|
||||||
|
else
|
||||||
|
echo "postsetup: dconf or keyfile dir not found in rootfs - skipping dconf compile"
|
||||||
|
fi
|
||||||
|
PSEOF
|
||||||
|
chmod +x "$_DCONF_POSTSETUP"
|
||||||
|
|
||||||
cd "$MKLIVE_DIR"
|
cd "$MKLIVE_DIR"
|
||||||
|
|
||||||
# ── Pre-bake nix packages ────────────────────────────────────────────────
|
# ── Pre-bake nix packages ────────────────────────────────────────────────
|
||||||
@@ -226,6 +248,7 @@ trap _cleanup_mklive_builds EXIT
|
|||||||
-v linux-mainline \
|
-v linux-mainline \
|
||||||
-p "$ISO_PKGS" \
|
-p "$ISO_PKGS" \
|
||||||
-I "$INCLUDE_DIR" \
|
-I "$INCLUDE_DIR" \
|
||||||
|
-x "$_DCONF_POSTSETUP" \
|
||||||
-x "$PROJECT_DIR/iso/postsetup-nvidia.sh" \
|
-x "$PROJECT_DIR/iso/postsetup-nvidia.sh" \
|
||||||
-C "${BOOT_CMDLINE:-}" \
|
-C "${BOOT_CMDLINE:-}" \
|
||||||
-o "$OUT_ISO"
|
-o "$OUT_ISO"
|
||||||
|
|||||||
@@ -859,7 +859,7 @@ ISO_PKGS=$(grep -vE '^\s*(#|$)' \
|
|||||||
| tr '\n' ' ')
|
| tr '\n' ' ')
|
||||||
TS="$(date -u +%Y%m%d)"
|
TS="$(date -u +%Y%m%d)"
|
||||||
OUT_ISO="${OUTPUT_ISO:-$OUT_DIR/void-live-niri-${TS}.iso}"
|
OUT_ISO="${OUTPUT_ISO:-$OUT_DIR/void-live-niri-${TS}.iso}"
|
||||||
BOOT_CMDLINE="${BOOT_CMDLINE:-live.user=${LIVE_USER} console=tty0 console=ttyS0,115200 nvidia-drm.modeset=1 rd.driver.blacklist=nouveau modprobe.blacklist=nouveau btusb.enable_autosuspend=0 snd-intel-dspcfg.dsp_driver=1 snd_hda_intel.dmic_detect=0}"
|
BOOT_CMDLINE="${BOOT_CMDLINE:-live.user=${LIVE_USER} console=tty0 console=ttyS0,115200 nvidia-drm.modeset=1 rd.driver.blacklist=nouveau modprobe.blacklist=nouveau btusb.enable_autosuspend=0}"
|
||||||
|
|
||||||
echo ">>> running mklive.sh inside docker — output: $OUT_ISO"
|
echo ">>> running mklive.sh inside docker — output: $OUT_ISO"
|
||||||
"$DOCKER" run --rm --privileged \
|
"$DOCKER" run --rm --privileged \
|
||||||
|
|||||||
Reference in New Issue
Block a user