Skip to content

Commit f7c09f0

Browse files
committed
[run_before_squashfs.sh] change from moving to delete nouveau blacklist configs from nvidia-utils
1 parent 355bf55 commit f7c09f0

File tree

2 files changed

+7
-3
lines changed

2 files changed

+7
-3
lines changed

prepare.sh

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,10 @@ wget -qN --show-progress -P "airootfs/root/" "https://raw.githubusercontent.com/
1818
# Make sure build scripts are executable
1919
chmod +x "./"{"mkarchiso","run_before_squashfs.sh"}
2020

21+
# uncomment to comment calamares package in packages.x86_64 in case you use local build of it
22+
#[ -n "$(ls airootfs/root/packages/*calamares* 2>/dev/null)" ] && sed -i '/calamares/ s/^/#/' packages.x86_64
23+
24+
2125
get_pkg() {
2226
sudo mkdir -p /tmp/pkg-cache \
2327
&& sudo pacman -Syw "$1" --cachedir /tmp/pkg-cache --noconfirm \

run_before_squashfs.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -95,9 +95,9 @@ chmod 644 "/usr/share/endeavouros/backgrounds/"*".png"
9595
echo "---> install bash configs back into /etc/skel for offline install target --->"
9696
cp -af "/root/filebackups/"{".bashrc",".bash_profile"} "/etc/skel/"
9797
98-
echo "---> Move blacklisting nouveau out of ISO (copy back to target for offline installs) --->"
99-
mv "/usr/lib/modprobe.d/nvidia-utils.conf" "/etc/calamares/files/nv-modprobe"
100-
mv "/usr/lib/modules-load.d/nvidia-utils.conf" "/etc/calamares/files/nv-modules-load"
98+
echo "---> remove blacklisting nouveau out of ISO (nvidia-utls blacklist configs) --->"
99+
rm "/usr/lib/modprobe.d/nvidia-utils.conf"
100+
rm "/usr/lib/modules-load.d/nvidia-utils.conf"
101101
102102
echo "---> get needed packages for offline installs --->"
103103
mkdir -p "/usr/share/packages"

0 commit comments

Comments
 (0)