nvidia-fix

This commit is contained in:
simono41 2018-05-03 14:47:08 +02:00
parent f590ed9ad9
commit 68eabd8c28
3 changed files with 2 additions and 9 deletions

View file

@ -309,7 +309,7 @@ function installation {
fi fi
echo "" echo ""
if [ "${version}" == "libre" ] || [ "${offline}" == "n" ]; then if [ "${version}" == "libre" ] || [ "${offline}" == "n" ] || [ "${version}" == "manjaro" ]; then
echo "MODULES=\"i915 radeon nouveau ata_generic ata_piix nls_cp437 vfat ext4 btrfs\"" > ${mountpoint}/etc/mkinitcpio.conf echo "MODULES=\"i915 radeon nouveau ata_generic ata_piix nls_cp437 vfat ext4 btrfs\"" > ${mountpoint}/etc/mkinitcpio.conf
echo "HOOKS=\"${parameter}\"" >> ${mountpoint}/etc/mkinitcpio.conf echo "HOOKS=\"${parameter}\"" >> ${mountpoint}/etc/mkinitcpio.conf
echo "COMPRESSION=\"lz4\"" >> ${mountpoint}/etc/mkinitcpio.conf echo "COMPRESSION=\"lz4\"" >> ${mountpoint}/etc/mkinitcpio.conf

View file

@ -128,7 +128,7 @@ function system() {
echo "blacklist floppy" > ${work_dir}/${arch}/airootfs/etc/modprobe.d/blacklist-floppy.conf echo "blacklist floppy" > ${work_dir}/${arch}/airootfs/etc/modprobe.d/blacklist-floppy.conf
echo "blacklist nouveau" > ${work_dir}/${arch}/airootfs/etc/modprobe.d/blacklist_nouveau.conf echo "blacklist nouveau" > ${work_dir}/${arch}/airootfs/etc/modprobe.d/blacklist_nouveau.conf
if [ "${version}" == "libre" ] || [ "${version}" == "lite" ]; then if [ "${version}" == "libre" ] || [ "${version}" == "lite" ] || [ "${version}" == "manjaro" ]; then
echo "MODULES=\"i915 radeon nouveau ata_generic ata_piix nls_cp437 vfat ext4 btrfs\"" > ${work_dir}/${arch}/airootfs/etc/mkinitcpio.conf echo "MODULES=\"i915 radeon nouveau ata_generic ata_piix nls_cp437 vfat ext4 btrfs\"" > ${work_dir}/${arch}/airootfs/etc/mkinitcpio.conf
echo "HOOKS=\"base udev plymouth archiso block filesystems keyboard\"" >> ${work_dir}/${arch}/airootfs/etc/mkinitcpio.conf echo "HOOKS=\"base udev plymouth archiso block filesystems keyboard\"" >> ${work_dir}/${arch}/airootfs/etc/mkinitcpio.conf
echo "COMPRESSION=\"lz4\"" >> ${work_dir}/${arch}/airootfs/etc/mkinitcpio.conf echo "COMPRESSION=\"lz4\"" >> ${work_dir}/${arch}/airootfs/etc/mkinitcpio.conf

View file

@ -336,8 +336,6 @@ lib32-mesa
lib32-mesa-demos lib32-mesa-demos
lib32-mesa-vdpau lib32-mesa-vdpau
lib32-ncurses lib32-ncurses
lib32-nvidia-libgl
lib32-opencl-nvidia
lib32-pcre lib32-pcre
lib32-readline lib32-readline
lib32-systemd lib32-systemd
@ -675,12 +673,7 @@ nss-mdns
ntfs-3g ntfs-3g
ntp ntp
numlockx numlockx
nvidia
nvidia-libgl
nvidia-settings
nvidia-utils
openal openal
opencl-nvidia
openconnect openconnect
opencore-amr opencore-amr
openexr openexr