From 91978706279a19a3ac96393630876f3e50cbc518 Mon Sep 17 00:00:00 2001 From: Nippy Date: Fri, 9 Oct 2026 10:49:26 +0200 Subject: fix --- .../calamares/modules/calamares-create-snapshots-subvol.sh | 6 ------ .../etc/calamares/modules/calamares-gpu-drivers.sh | 1 - .../etc/calamares/modules/calamares-normalize-subvolumes.sh | 11 ----------- .../etc/calamares/modules/netinstall-drivers.yaml | 2 +- .../etc/calamares/modules/raveos-chown-homes.sh | 2 -- .../etc/calamares/modules/raveos-copy-brave-profile.sh | 3 --- .../etc/calamares/modules/shellprocess-before.conf | 1 - .../etc/calamares/modules/shellprocess-dkms.conf | 1 - .../etc/calamares/modules/shellprocess-loader.conf | 12 ------------ .../etc/calamares/modules/shellprocess-supporters.conf | 3 --- 10 files changed, 1 insertion(+), 41 deletions(-) (limited to 'raveos-calamares-theme/etc/calamares/modules') diff --git a/raveos-calamares-theme/etc/calamares/modules/calamares-create-snapshots-subvol.sh b/raveos-calamares-theme/etc/calamares/modules/calamares-create-snapshots-subvol.sh index 092b7b9..73aa002 100644 --- a/raveos-calamares-theme/etc/calamares/modules/calamares-create-snapshots-subvol.sh +++ b/raveos-calamares-theme/etc/calamares/modules/calamares-create-snapshots-subvol.sh @@ -3,12 +3,6 @@ set -e echo ">>> [snapshots-subvol] Running INSIDE target system" -# Calamares' partition module ignores our btrfsSubvolumes config here and -# always creates its own hardcoded set (/home /root /srv /var/cache -# /var/log /var/tmp as separate subvolumes) -- there's no ".snapshots" -# subvolume among them, which grub-btrfs/Snapper need. Create it by hand -# as a proper top-level (subvolid=5) sibling of the other subvolumes, -# so snapshots of "/" don't recursively include the snapshot store itself. ROOT_DEV="$(findmnt -no SOURCE / | sed 's/\[.*\]//')" ROOT_FS="$(findmnt -no FSTYPE /)" diff --git a/raveos-calamares-theme/etc/calamares/modules/calamares-gpu-drivers.sh b/raveos-calamares-theme/etc/calamares/modules/calamares-gpu-drivers.sh index 22e59d7..462a289 100644 --- a/raveos-calamares-theme/etc/calamares/modules/calamares-gpu-drivers.sh +++ b/raveos-calamares-theme/etc/calamares/modules/calamares-gpu-drivers.sh @@ -19,7 +19,6 @@ if echo "$GPU_INFO" | grep -qi "Intel"; then install_pkgs mesa vulkan-intel intel-media-driver fi -# AMD if echo "$GPU_INFO" | grep -qi "AMD\|ATI"; then echo ">>> [gpu] Installing AMD stack..." install_pkgs mesa lib32-mesa vulkan-radeon lib32-vulkan-radeon vulkan-icd-loader lib32-vulkan-icd-loader vulkan-tools mesa-utils diff --git a/raveos-calamares-theme/etc/calamares/modules/calamares-normalize-subvolumes.sh b/raveos-calamares-theme/etc/calamares/modules/calamares-normalize-subvolumes.sh index 83b42c4..8e68e50 100644 --- a/raveos-calamares-theme/etc/calamares/modules/calamares-normalize-subvolumes.sh +++ b/raveos-calamares-theme/etc/calamares/modules/calamares-normalize-subvolumes.sh @@ -11,12 +11,6 @@ if [ "$ROOT_FS" != "btrfs" ]; then exit 0 fi -# Calamares' partition module ignores our btrfsSubvolumes config entirely -# and always creates its own hardcoded set: @, @home, @root, @srv, @cache, -# @log, @tmp. We only want @, @home, @log, @pkg (just /var/cache/pacman/pkg, -# not all of /var/cache) and @snapshots (created separately). Drop the rest -# here, after everything else has already run, merging any content back -# into the parent (@) subvolume first. mkdir -p /mnt/topvol mount -o subvolid=5 "${ROOT_DEV}" /mnt/topvol @@ -40,8 +34,6 @@ for entry in "root:@root" "srv:@srv" "var/tmp:@tmp"; do if findmnt -no SOURCE "$path" >/dev/null 2>&1; then echo ">>> [subvol-normalize] Removing separate subvolume ${subvol} (${path})" unmount_retry "$path" - # $path is now a plain empty dir in @ again -- copy the old - # subvolume's content back into it before deleting the subvolume. if [ -d "/mnt/topvol/${subvol}" ] && ! findmnt -no SOURCE "$path" >/dev/null 2>&1; then cp -a "/mnt/topvol/${subvol}/." "$path/" 2>/dev/null || true btrfs subvolume delete "/mnt/topvol/${subvol}" || true @@ -50,9 +42,6 @@ for entry in "root:@root" "srv:@srv" "var/tmp:@tmp"; do sed -i "\#[[:space:]]${path}[[:space:]]#d" /etc/fstab done -# Narrow /var/cache: drop the whole-@cache subvolume (keep it as a plain -# directory), and create a dedicated @pkg subvolume just for pacman's -# package cache -- that's the only part of /var/cache archinstall separates. if findmnt -no SOURCE /var/cache >/dev/null 2>&1; then echo ">>> [subvol-normalize] Narrowing /var/cache -> only pacman/pkg as @pkg" unmount_retry /var/cache diff --git a/raveos-calamares-theme/etc/calamares/modules/netinstall-drivers.yaml b/raveos-calamares-theme/etc/calamares/modules/netinstall-drivers.yaml index a5613a5..4e325fb 100644 --- a/raveos-calamares-theme/etc/calamares/modules/netinstall-drivers.yaml +++ b/raveos-calamares-theme/etc/calamares/modules/netinstall-drivers.yaml @@ -8,7 +8,7 @@ - name: "NVIDIA Driver" selected: false expanded: false - exlusive: false + exclusive: false packages: - nvidia-open-dkms - nvidia-utils diff --git a/raveos-calamares-theme/etc/calamares/modules/raveos-chown-homes.sh b/raveos-calamares-theme/etc/calamares/modules/raveos-chown-homes.sh index f271c05..c61e0d6 100755 --- a/raveos-calamares-theme/etc/calamares/modules/raveos-chown-homes.sh +++ b/raveos-calamares-theme/etc/calamares/modules/raveos-chown-homes.sh @@ -1,6 +1,4 @@ #!/bin/bash -# RaveOS: célrendszer /home könyvtárainak rekurzív chown-ja a céluserhez. -# A Calamares shellprocess-final (dontChroot: true) hívja, $1 = ${ROOT}. set -euo pipefail ROOT="${1:-}" diff --git a/raveos-calamares-theme/etc/calamares/modules/raveos-copy-brave-profile.sh b/raveos-calamares-theme/etc/calamares/modules/raveos-copy-brave-profile.sh index 59a24d6..29e4253 100755 --- a/raveos-calamares-theme/etc/calamares/modules/raveos-copy-brave-profile.sh +++ b/raveos-calamares-theme/etc/calamares/modules/raveos-copy-brave-profile.sh @@ -1,6 +1,4 @@ #!/usr/bin/env bash -# RaveOS: Brave Origin profil másolása a céluser HOME-jába -# A Calamares shellprocess (dontChroot: true) hívja, $1 = ${ROOT}. set -euo pipefail ROOT="${1:-}" @@ -9,7 +7,6 @@ ROOT="${1:-}" SRC="/etc/calamares/brave-profile" [ -d "$SRC" ] || { echo "raveos-copy-brave-profile: forrás hiányzik ($SRC)"; exit 0; } -# Céluser + UID:GID a target /etc/passwd-ből (nem a live rendszerből) USERLINE=$(awk -F: '$3>=1000 && $3<60000 && $7 !~ /(nologin|false)/ {print; exit}' "$ROOT/etc/passwd") [ -n "$USERLINE" ] || { echo "raveos-copy-brave-profile: nincs céluser"; exit 0; } diff --git a/raveos-calamares-theme/etc/calamares/modules/shellprocess-before.conf b/raveos-calamares-theme/etc/calamares/modules/shellprocess-before.conf index 2bb1194..4a9c1da 100644 --- a/raveos-calamares-theme/etc/calamares/modules/shellprocess-before.conf +++ b/raveos-calamares-theme/etc/calamares/modules/shellprocess-before.conf @@ -3,4 +3,3 @@ timeout: 999 script: - "-/usr/bin/pacman -Sy --noconfirm chaotic-keyring" - - "-/usr/bin/pacman -Syu --noconfirm" diff --git a/raveos-calamares-theme/etc/calamares/modules/shellprocess-dkms.conf b/raveos-calamares-theme/etc/calamares/modules/shellprocess-dkms.conf index be6d235..c0cd6da 100644 --- a/raveos-calamares-theme/etc/calamares/modules/shellprocess-dkms.conf +++ b/raveos-calamares-theme/etc/calamares/modules/shellprocess-dkms.conf @@ -1,4 +1,3 @@ -# DKMS modules install dontChroot: false # run inside target chroot so DKMS builds against the installed kernel timeout: 3600 # Give it plenty of time (1 hour) for slow downloads diff --git a/raveos-calamares-theme/etc/calamares/modules/shellprocess-loader.conf b/raveos-calamares-theme/etc/calamares/modules/shellprocess-loader.conf index 62fd87d..a65c6ef 100644 --- a/raveos-calamares-theme/etc/calamares/modules/shellprocess-loader.conf +++ b/raveos-calamares-theme/etc/calamares/modules/shellprocess-loader.conf @@ -1,29 +1,17 @@ dontChroot: true timeout: 60 script: - # 1. Copy across RaveOS bootloader, loader.conf, remove the other entry - command: "cp -r /root/.loader.conf ${ROOT}/boot/loader/loader.conf || true" - command: "rm -r ${ROOT}/boot/loader/entries/*cachyos* || true" - # 2. Safety net: 95-raveos.install can silently produce a loader entry - # with no root= (findmnt returns empty depending on chroot context - # at kernel-install-hook time during pacstrap). Patch it here from - # the by-now-correct /etc/fstab. - command: "install -Dm755 /etc/calamares/modules/calamares-fix-bootentry.sh ${ROOT}/root/calamares-fix-bootentry.sh" - command: "arch-chroot ${ROOT} /bin/bash /root/calamares-fix-bootentry.sh" - command: "-rm ${ROOT}/root/calamares-fix-bootentry.sh" - # 3. Calamares' btrfsSubvolumes config is silently ignored -- it always - # creates its own hardcoded set (@, @home, @root, @srv, @cache, @log, - # @tmp). Drop the ones we don't want (@root, @srv, @tmp) and narrow - # @cache down to just /var/cache/pacman/pkg as @pkg. - command: "install -Dm755 /etc/calamares/modules/calamares-normalize-subvolumes.sh ${ROOT}/root/calamares-normalize-subvolumes.sh" - command: "arch-chroot ${ROOT} /bin/bash /root/calamares-normalize-subvolumes.sh" - command: "-rm ${ROOT}/root/calamares-normalize-subvolumes.sh" - # 4. Calamares' hardcoded btrfs subvolume layout has no .snapshots -- - # create it by hand (needed by grub-btrfs/Snapper). - command: "install -Dm755 /etc/calamares/modules/calamares-create-snapshots-subvol.sh ${ROOT}/root/calamares-create-snapshots-subvol.sh" - command: "arch-chroot ${ROOT} /bin/bash /root/calamares-create-snapshots-subvol.sh" - command: "-rm ${ROOT}/root/calamares-create-snapshots-subvol.sh" - # - command: "install -Dm755 /etc/calamares/modules/calamares-microcode-fix.sh ${ROOT}/root/calamares-microcode-fix.sh" diff --git a/raveos-calamares-theme/etc/calamares/modules/shellprocess-supporters.conf b/raveos-calamares-theme/etc/calamares/modules/shellprocess-supporters.conf index 2f6c6d8..6f5ac7e 100644 --- a/raveos-calamares-theme/etc/calamares/modules/shellprocess-supporters.conf +++ b/raveos-calamares-theme/etc/calamares/modules/shellprocess-supporters.conf @@ -2,8 +2,5 @@ dontChroot: true timeout: 20 script: - # RaveOS: fetch the fresh supporters list (if online). Validated steps: - # download -> check "var names" and "]" -> replace. On any error the - # packaged list stays (|| true). - command: "curl -fsSL --max-time 10 https://page.rp1.hu/supporters.js?t=$(date +%s) -o /tmp/raveos_supporters.js && grep -q 'var names' /tmp/raveos_supporters.js && grep -q ']' /tmp/raveos_supporters.js && cp /tmp/raveos_supporters.js /etc/calamares/branding/raveos/supporters.js || true" name: "Downloading supporters list..." -- cgit v1.3