fix

4 files changed, 5 insertions, 26 deletions

diff --git a/releng/airootfs/usr/local/bin/livecd-sound b/releng/airootfs/usr/local/bin/livecd-sound
index b92fcf2..19a83ff 100755
--- a/releng/airootfs/usr/local/bin/livecd-sound
+++ b/releng/airootfs/usr/local/bin/livecd-sound
@@ -191,7 +191,7 @@ pick_a_card() {
         exit 0
     fi
     systemd-cat -t "livecdsound" printf "multiple sound cards detected\n"
-    for card in "${usable_cards[@]}"; do
+    for card in $usable_cards; do
         if ! is_numeric "$card"; then
             continue
         fi
@@ -199,7 +199,7 @@ pick_a_card() {
     done
     wait
     sleep 1
-    for card in "${usable_cards[@]}"; do
+    for card in $usable_cards; do
         if ! is_numeric "$card"; then
             continue
         fi
diff --git a/releng/airootfs/usr/local/share/livecd-sound/asound.conf.in b/releng/airootfs/usr/local/share/livecd-sound/asound.conf.in
index 3f9c7aa..b08b147 100644
--- a/releng/airootfs/usr/local/share/livecd-sound/asound.conf.in
+++ b/releng/airootfs/usr/local/share/livecd-sound/asound.conf.in
@@ -1,3 +1,2 @@
-Defaults node
 defaults.ctl.card %card%;
 defaults.pcm.card %card%;
diff --git a/releng/airootfs/usr/share/calamares/kernel-install/95-raveos.install b/releng/airootfs/usr/share/calamares/kernel-install/95-raveos.install
index 94b4330..c4ffaa5 100755
--- a/releng/airootfs/usr/share/calamares/kernel-install/95-raveos.install
+++ b/releng/airootfs/usr/share/calamares/kernel-install/95-raveos.install
@@ -1,12 +1,10 @@
 #!/bin/bash
-# Single-entry, systemd-compliant kernel-install hook for CachyOS
 
 set -e
 
 COMMAND="$1"          # add | remove
 KERNEL_VERSION="$2"   # e.g. 6.18.4-1-cachyos
 
-# Only act on CachyOS kernels
 case "$KERNEL_VERSION" in
   *cachyos*) ;;
   *) exit 0 ;;
@@ -16,13 +14,9 @@ BOOT_ROOT="${KERNEL_INSTALL_BOOT_ROOT:-/boot}"
 ENTRY_DIR="$BOOT_ROOT/loader/entries"
 ENTRY_FILE="$ENTRY_DIR/raveos.conf"
 
-# --------------------------------------------------
-# Fixed CachyOS kernel paths (non-versioned)
-# --------------------------------------------------
 LINUX_IMAGE="/vmlinuz-linux-cachyos"
 INITRAMFS_IMAGE="/initramfs-linux-cachyos.img"
 
-# CPU Microcode detection (Intel vs AMD)
 MICROCODE=""
 CPU_VENDOR="$(grep -m1 'vendor_id' /proc/cpuinfo 2>/dev/null | awk '{print $3}' || true)"
 if [ "$CPU_VENDOR" = "GenuineIntel" ] && [ -f "$BOOT_ROOT/intel-ucode.img" ]; then
@@ -34,9 +28,6 @@ else
   [ -f "$BOOT_ROOT/amd-ucode.img" ] && MICROCODE="/amd-ucode.img"
 fi
 
-# Root device detection with fallback.
-# findmnt prints btrfs mounts as "/dev/vda2[/@]" (device plus subvolume),
-# which is not a valid device node for blkid/mount -- strip the bracket part.
 ROOT_SRC="$(findmnt -no SOURCE / | sed 's/\[.*\]//' || true)"
 ROOT_FS="$(findmnt -no FSTYPE / || true)"
 ROOT_OPTS="$(findmnt -no OPTIONS / || true)"
@@ -62,9 +53,10 @@ esac
 
 OPTIONS="rw quiet splash"
 
-# LUKS Encryption & Root Device Fallbacks
 if [[ "$ROOT_SRC" == /dev/mapper/* ]]; then
-  UUID="$(blkid -s UUID -o value "$ROOT_SRC" || true)"
+  PARENT_NAME="$(lsblk -no pkname "$ROOT_SRC" 2>/dev/null | head -n1)"
+  UUID=""
+  [ -n "$PARENT_NAME" ] && UUID="$(blkid -s UUID -o value "/dev/$PARENT_NAME" 2>/dev/null || true)"
   if [ -n "$UUID" ]; then
     OPTIONS="cryptdevice=UUID=$UUID:cryptroot root=/dev/mapper/cryptroot $OPTIONS"
   else
@@ -84,9 +76,6 @@ else
   fi
 fi
 
-# --------------------------------------------------
-# Btrfs subvolume support
-# --------------------------------------------------
 if [ "$ROOT_FS" = "btrfs" ]; then
   SUBVOL="$(echo "$ROOT_OPTS" | tr ',' '\n' | grep '^subvol=' || true)"
   [ -n "$SUBVOL" ] && OPTIONS="$OPTIONS rootflags=$SUBVOL"
@@ -106,7 +95,6 @@ case "$COMMAND" in
     ;;
 
   remove)
-    # Only remove entry if this was the last CachyOS kernel
     rm -f "$ENTRY_FILE"
     ;;
 
diff --git a/releng/airootfs/usr/share/plymouth/themes/raveos/raveos.script b/releng/airootfs/usr/share/plymouth/themes/raveos/raveos.script
index 70ee581..e92e3c4 100644
--- a/releng/airootfs/usr/share/plymouth/themes/raveos/raveos.script
+++ b/releng/airootfs/usr/share/plymouth/themes/raveos/raveos.script
@@ -1,4 +1,3 @@
-// RaveOS Plymouth boot splash script (live install medium)
 
 Window.SetBackgroundTopColor(0.102, 0.106, 0.114);
 Window.SetBackgroundBottomColor(0.075, 0.078, 0.086);
@@ -6,7 +5,6 @@ Window.SetBackgroundBottomColor(0.075, 0.078, 0.086);
 screen_width = Window.GetWidth();
 screen_height = Window.GetHeight();
 
-// --- logo: owl icon, centered ---
 
 owl_image = Image("raveos-owl.png");
 owl_width = owl_image.GetWidth();
@@ -23,7 +21,6 @@ owl_x = screen_width / 2 - owl_width / 2;
 owl_y = screen_height / 2 - owl_height / 2 - 20;
 owl_sprite.SetPosition(owl_x, owl_y, 10);
 
-// --- status text: pre-rendered PNG cycling by boot progress ---
 
 status_count = 6;
 status_images[0] = Image("status-01.png");
@@ -40,7 +37,6 @@ status_y = owl_y + owl_height + 40;
 
 seconds_per_stage = 1.2;
 
-// --- progress dots ---
 
 dot_lit_image = Image("dot-lit.png");
 dot_dim_image = Image("dot-dim.png");
@@ -86,16 +82,12 @@ fun update_status(index)
 
 update_status(0);
 
-# "duration" a valos eltelt masodperc a boot ota - ez mindig pontos,
-# ellentetben a "progress" becslessel (ami elozo boot-idomeresre tamaszkodik,
-# es elso/friss elo boot-nal megbizhatatlan / gyakorlatilag 0-n ragad).
 Plymouth.SetBootProgressFunction(fun(duration, progress)
 {
   index = Math.Int(duration / seconds_per_stage);
   update_status(index);
 });
 
-// --- password prompt (LUKS unlock) ---
 
 fun display_password_callback(prompt, bullets)
 {