From f7c09f0af2152afa71c004e53ead8e56afbdd2d5 Mon Sep 17 00:00:00 2001 From: killajoe Date: Tue, 27 Jan 2026 16:39:05 +0100 Subject: [PATCH] [run_before_squashfs.sh] change from moving to delete nouveau blacklist configs from nvidia-utils --- prepare.sh | 4 ++++ run_before_squashfs.sh | 6 +++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/prepare.sh b/prepare.sh index eae104d..fa629c1 100755 --- a/prepare.sh +++ b/prepare.sh @@ -18,6 +18,10 @@ wget -qN --show-progress -P "airootfs/root/" "https://raw.githubusercontent.com/ # Make sure build scripts are executable chmod +x "./"{"mkarchiso","run_before_squashfs.sh"} +# uncomment to comment calamares package in packages.x86_64 in case you use local build of it +#[ -n "$(ls airootfs/root/packages/*calamares* 2>/dev/null)" ] && sed -i '/calamares/ s/^/#/' packages.x86_64 + + get_pkg() { sudo mkdir -p /tmp/pkg-cache \ && sudo pacman -Syw "$1" --cachedir /tmp/pkg-cache --noconfirm \ diff --git a/run_before_squashfs.sh b/run_before_squashfs.sh index 7c98822..1d4a8c4 100755 --- a/run_before_squashfs.sh +++ b/run_before_squashfs.sh @@ -95,9 +95,9 @@ chmod 644 "/usr/share/endeavouros/backgrounds/"*".png" echo "---> install bash configs back into /etc/skel for offline install target --->" cp -af "/root/filebackups/"{".bashrc",".bash_profile"} "/etc/skel/" -echo "---> Move blacklisting nouveau out of ISO (copy back to target for offline installs) --->" -mv "/usr/lib/modprobe.d/nvidia-utils.conf" "/etc/calamares/files/nv-modprobe" -mv "/usr/lib/modules-load.d/nvidia-utils.conf" "/etc/calamares/files/nv-modules-load" +echo "---> remove blacklisting nouveau out of ISO (nvidia-utls blacklist configs) --->" +rm "/usr/lib/modprobe.d/nvidia-utils.conf" +rm "/usr/lib/modules-load.d/nvidia-utils.conf" echo "---> get needed packages for offline installs --->" mkdir -p "/usr/share/packages"