simono41/SpectreOS-old
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

deactivate_nvidia_dkms

Browse source
This commit is contained in:
simono41 2018-04-02 05:57:35 +02:00
parent 84e66aa3d2
commit 46b2ff7e4e
16 changed files with 61 additions and 70 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
arch-graphical-install-auto
View file

@ -760,7 +760,7 @@ if [ "${version}" == "libre" ]; then
mkinitcpio -p linux-libre
else
mkinitcpio -p linux -c /etc/mkinitcpio.conf
mkinitcpio -p linux-lts -c /etc/mkinitcpio-lts.conf
#mkinitcpio -p linux-lts -c /etc/mkinitcpio-lts.conf
fi
echo "Fertig!!!"

46
arch-install
View file

@ -293,15 +293,15 @@ function installation {
echo "FILES=\"/etc/modprobe.d/blacklist-floppy.conf /etc/modprobe.d/blacklist_nouveau.conf\"" >> ${mountpoint}/etc/mkinitcpio.conf
else
echo "MODULES=\"i915 radeon ata_generic ata_piix nls_cp437 vfat ext4 btrfs\"" > ${mountpoint}/etc/mkinitcpio.conf
#echo "MODULES=\"i915 radeon ata_generic ata_piix nls_cp437 vfat ext4 btrfs\"" > ${mountpoint}/etc/mkinitcpio.conf
#echo "HOOKS=\"${parameter}\"" >> ${mountpoint}/etc/mkinitcpio.conf
#echo "COMPRESSION=\"lz4\"" >> ${mountpoint}/etc/mkinitcpio.conf
#echo "FILES=\"/etc/modprobe.d/blacklist-floppy.conf\"" >> ${mountpoint}/etc/mkinitcpio.conf
echo "MODULES=\"nvidia nvidia_modeset nvidia_uvm nvidia_drm i915 radeon ata_generic ata_piix nls_cp437 vfat ext4 btrfs\"" > ${mountpoint}/etc/mkinitcpio.conf
echo "HOOKS=\"${parameter}\"" >> ${mountpoint}/etc/mkinitcpio.conf
echo "COMPRESSION=\"lz4\"" >> ${mountpoint}/etc/mkinitcpio.conf
echo "FILES=\"/etc/modprobe.d/blacklist-floppy.conf\"" >> ${mountpoint}/etc/mkinitcpio.conf
echo "MODULES=\"nvidia nvidia_modeset nvidia_uvm nvidia_drm i915 radeon ata_generic ata_piix nls_cp437 vfat ext4 btrfs\"" > ${mountpoint}/etc/mkinitcpio-lts.conf
echo "HOOKS=\"${parameter}\"" >> ${mountpoint}/etc/mkinitcpio-lts.conf
echo "COMPRESSION=\"lz4\"" >> ${mountpoint}/etc/mkinitcpio-lts.conf
echo "FILES=\"/etc/modprobe.d/blacklist-floppy.conf /etc/modprobe.d/blacklist_nouveau.conf\"" >> ${mountpoint}/etc/mkinitcpio-lts.conf
echo "FILES=\"/etc/modprobe.d/blacklist-floppy.conf /etc/modprobe.d/blacklist_nouveau.conf\"" >> ${mountpoint}/etc/mkinitcpio.conf
fi
echo ""
@ -653,18 +653,18 @@ function systemdboot() {
echo "initrd /initramfs-linux-fallback.img" >> ${mountpoint}/boot/loader/entries/arch-uefi-fallback.conf
echo "options root=${tobootdevice} rw ${parameter}quiet splash" >> ${mountpoint}/boot/loader/entries/arch-uefi-fallback.conf
if [ "${version}" != "libre" ]; then
echo "title "${repo}-lts"" > ${mountpoint}/boot/loader/entries/arch-uefi-lts.conf
echo "linux /vmlinuz-linux-lts" >> ${mountpoint}/boot/loader/entries/arch-uefi-lts.conf
echo "initrd /intel-ucode.img" >> ${mountpoint}/boot/loader/entries/arch-uefi-lts.conf
echo "initrd /initramfs-linux-lts.img" >> ${mountpoint}/boot/loader/entries/arch-uefi-lts.conf
echo "options root=${tobootdevice} rw ${parameter}nvidia-drm.modeset=1 quiet splash" >> ${mountpoint}/boot/loader/entries/arch-uefi-lts.conf
#if [ "${version}" != "libre" ]; then
#echo "title "${repo}-lts"" > ${mountpoint}/boot/loader/entries/arch-uefi-lts.conf
#echo "linux /vmlinuz-linux-lts" >> ${mountpoint}/boot/loader/entries/arch-uefi-lts.conf
#echo "initrd /intel-ucode.img" >> ${mountpoint}/boot/loader/entries/arch-uefi-lts.conf
#echo "initrd /initramfs-linux-lts.img" >> ${mountpoint}/boot/loader/entries/arch-uefi-lts.conf
#echo "options root=${tobootdevice} rw ${parameter}nvidia-drm.modeset=1 quiet splash" >> ${mountpoint}/boot/loader/entries/arch-uefi-lts.conf
echo "title "${repo}-lts"" > ${mountpoint}/boot/loader/entries/arch-uefi-fallback-lts.conf
echo "linux /vmlinuz-linux-lts" >> ${mountpoint}/boot/loader/entries/arch-uefi-fallback-lts.conf
echo "initrd /intel-ucode.img" >> ${mountpoint}/boot/loader/entries/arch-uefi-fallback-lts.conf
echo "initrd /initramfs-linux-fallback-lts.img" >> ${mountpoint}/boot/loader/entries/arch-uefi-fallback-lts.conf
echo "options root=${tobootdevice} rw ${parameter}nvidia-drm.modeset=1 quiet splash" >> ${mountpoint}/boot/loader/entries/arch-uefi-fallback-lts.conf
#echo "title "${repo}-lts"" > ${mountpoint}/boot/loader/entries/arch-uefi-fallback-lts.conf
#echo "linux /vmlinuz-linux-lts" >> ${mountpoint}/boot/loader/entries/arch-uefi-fallback-lts.conf
#echo "initrd /intel-ucode.img" >> ${mountpoint}/boot/loader/entries/arch-uefi-fallback-lts.conf
#echo "initrd /initramfs-linux-fallback-lts.img" >> ${mountpoint}/boot/loader/entries/arch-uefi-fallback-lts.conf
#echo "options root=${tobootdevice} rw ${parameter}nvidia-drm.modeset=1 quiet splash" >> ${mountpoint}/boot/loader/entries/arch-uefi-fallback-lts.conf
fi
echo "default arch-uefi" > ${mountpoint}/boot/loader/loader.conf
@ -678,9 +678,9 @@ function systemdboot() {
arch-chroot ${mountpoint} efibootmgr -c -d ${device} -p 1 -l \vmlinuz-linux -L "Arch Linux efistub" -u "initrd=/initramfs-linux.img root=${tobootdevice} rw ${parameter}quiet splash"
if [ "${version}" != "libre" ]; then
arch-chroot ${mountpoint} efibootmgr -c -d ${device} -p 1 -l \vmlinuz-linux-lts -L "Arch Linux efistub" -u "initrd=/initramfs-linux-lts.img root=${tobootdevice} rw ${parameter}nvidia-drm.modeset=1 quiet splash"
fi
#if [ "${version}" != "libre" ]; then
#arch-chroot ${mountpoint} efibootmgr -c -d ${device} -p 1 -l \vmlinuz-linux-lts -L "Arch Linux efistub" -u "initrd=/initramfs-linux-lts.img root=${tobootdevice} rw ${parameter}nvidia-drm.modeset=1 quiet splash"
#fi
# überschreibt die efistub deswegen entfernt
#arch-chroot ${mountpoint} efibootmgr -c -d ${device} -p 1 -l \vmlinuz-linux -L "Arch Linux fallback efistub" -u "initrd=/initramfs-linux-fallback.img root=${tobootdevice} rw ${parameter}nvidia-drm.modeset=1 quiet splash"
@ -1033,7 +1033,7 @@ then
arch-chroot ${mountpoint} mkinitcpio -p linux-libre
else
arch-chroot ${mountpoint} mkinitcpio -p linux -c /etc/mkinitcpio.conf
arch-chroot ${mountpoint} mkinitcpio -p linux-lts -c /etc/mkinitcpio-lts.conf
#arch-chroot ${mountpoint} mkinitcpio -p linux-lts -c /etc/mkinitcpio-lts.conf
fi
echo ""
if [ "${boot}" == "grub" ]
@ -1064,7 +1064,7 @@ elif [ "${Partition}" == "bios" ]; then
arch-chroot ${mountpoint} mkinitcpio -p linux-libre
else
arch-chroot ${mountpoint} mkinitcpio -p linux -c /etc/mkinitcpio.conf
arch-chroot ${mountpoint} mkinitcpio -p linux-lts -c /etc/mkinitcpio-lts.conf
#arch-chroot ${mountpoint} mkinitcpio -p linux-lts -c /etc/mkinitcpio-lts.conf
fi
arch-chroot ${mountpoint} grub-install --target=i386-pc --recheck ${device}
arch-chroot ${mountpoint} grub-mkconfig -o /boot/grub/grub.cfg

32
make_mksquashfs-auto.sh
View file

@ -100,15 +100,15 @@ function filesystem() {
echo "FILES=\"/etc/modprobe.d/blacklist-floppy.conf\"" >> ${work_dir}/${arch}/airootfs/etc/mkinitcpio.conf
else
echo "MODULES=\"i915 radeon ata_generic ata_piix nls_cp437 vfat ext4 btrfs\"" > ${work_dir}/${arch}/airootfs/etc/mkinitcpio.conf
#echo "MODULES=\"i915 radeon ata_generic ata_piix nls_cp437 vfat ext4 btrfs\"" > ${work_dir}/${arch}/airootfs/etc/mkinitcpio.conf
#echo "HOOKS=\"base udev plymouth memdisk archiso_shutdown archiso archiso_loop_mnt archiso_pxe_common archiso_pxe_nbd archiso_pxe_http archiso_pxe_nfs archiso_kms block pcmcia filesystems keyboard cow_device\"" >> ${work_dir}/${arch}/airootfs/etc/mkinitcpio.conf
#echo "COMPRESSION=\"lz4\"" >> ${work_dir}/${arch}/airootfs/etc/mkinitcpio.conf
#echo "FILES=\"/etc/modprobe.d/blacklist-floppy.conf\"" >> ${work_dir}/${arch}/airootfs/etc/mkinitcpio.conf
echo "MODULES=\"nvidia nvidia_modeset nvidia_uvm nvidia_drm i915 radeon ata_generic ata_piix nls_cp437 vfat ext4 btrfs\"" > ${work_dir}/${arch}/airootfs/etc/mkinitcpio.conf
echo "HOOKS=\"base udev plymouth memdisk archiso_shutdown archiso archiso_loop_mnt archiso_pxe_common archiso_pxe_nbd archiso_pxe_http archiso_pxe_nfs archiso_kms block pcmcia filesystems keyboard cow_device\"" >> ${work_dir}/${arch}/airootfs/etc/mkinitcpio.conf
echo "COMPRESSION=\"lz4\"" >> ${work_dir}/${arch}/airootfs/etc/mkinitcpio.conf
echo "FILES=\"/etc/modprobe.d/blacklist-floppy.conf\"" >> ${work_dir}/${arch}/airootfs/etc/mkinitcpio.conf
echo "MODULES=\"nvidia nvidia_modeset nvidia_uvm nvidia_drm i915 radeon ata_generic ata_piix nls_cp437 vfat ext4 btrfs\"" > ${work_dir}/${arch}/airootfs/etc/mkinitcpio-lts.conf
echo "HOOKS=\"base udev plymouth memdisk archiso_shutdown archiso archiso_loop_mnt archiso_pxe_common archiso_pxe_nbd archiso_pxe_http archiso_pxe_nfs archiso_kms block pcmcia filesystems keyboard cow_device\"" >> ${work_dir}/${arch}/airootfs/etc/mkinitcpio-lts.conf
echo "COMPRESSION=\"lz4\"" >> ${work_dir}/${arch}/airootfs/etc/mkinitcpio-lts.conf
echo "FILES=\"/etc/modprobe.d/blacklist-floppy.conf /etc/modprobe.d/blacklist_nouveau.conf\"" >> ${work_dir}/${arch}/airootfs/etc/mkinitcpio-lts.conf
echo "FILES=\"/etc/modprobe.d/blacklist-floppy.conf /etc/modprobe.d/blacklist_nouveau.conf\"" >> ${work_dir}/${arch}/airootfs/etc/mkinitcpio.conf
fi
@ -184,10 +184,10 @@ function BIOS() {
cp ${work_dir}/${arch}/airootfs/boot/initramfs-linux${linuxparameter}.img ${work_dir}/iso/${install_dir}/boot/${arch}/archiso.img
cp ${work_dir}/${arch}/airootfs/boot/vmlinuz-linux${linuxparameter} ${work_dir}/iso/${install_dir}/boot/${arch}/vmlinuz
if [ "${version}" != "libre" ]; then
cp ${work_dir}/${arch}/airootfs/boot/initramfs-linux-lts.img ${work_dir}/iso/${install_dir}/boot/${arch}/archiso-lts.img
cp ${work_dir}/${arch}/airootfs/boot/vmlinuz-linux-lts ${work_dir}/iso/${install_dir}/boot/${arch}/vmlinuz-lts
fi
#if [ "${version}" != "libre" ]; then
#cp ${work_dir}/${arch}/airootfs/boot/initramfs-linux-lts.img ${work_dir}/iso/${install_dir}/boot/${arch}/archiso-lts.img
#cp ${work_dir}/${arch}/airootfs/boot/vmlinuz-linux-lts ${work_dir}/iso/${install_dir}/boot/${arch}/vmlinuz-lts
#fi
cp ${work_dir}/${arch}/airootfs/usr/lib/syslinux/bios/isolinux.bin ${work_dir}/iso/isolinux/
cp ${work_dir}/${arch}/airootfs/usr/lib/syslinux/bios/isohdpfx.bin ${work_dir}/iso/isolinux/
@ -244,7 +244,7 @@ function UEFI() {
echo "efiboot.img nicht vorhanden!"
fi
truncate -s 512M ${work_dir}/iso/EFI/archiso/efiboot.img
truncate -s 256M ${work_dir}/iso/EFI/archiso/efiboot.img
mkfs.vfat -n ${iso_label}_EFI ${work_dir}/iso/EFI/archiso/efiboot.img
mkdir -p ${work_dir}/efiboot
@ -258,10 +258,10 @@ function UEFI() {
cp ${work_dir}/iso/${install_dir}/boot/${arch}/vmlinuz ${work_dir}/efiboot/EFI/archiso/vmlinuz.efi
cp ${work_dir}/iso/${install_dir}/boot/${arch}/archiso.img ${work_dir}/efiboot/EFI/archiso/archiso.img
if [ "${version}" != "libre" ]; then
cp ${work_dir}/iso/${install_dir}/boot/${arch}/vmlinuz-lts ${work_dir}/efiboot/EFI/archiso/vmlinuz-lts.efi
cp ${work_dir}/iso/${install_dir}/boot/${arch}/archiso-lts.img ${work_dir}/efiboot/EFI/archiso/archiso-lts.img
fi
#if [ "${version}" != "libre" ]; then
#cp ${work_dir}/iso/${install_dir}/boot/${arch}/vmlinuz-lts ${work_dir}/efiboot/EFI/archiso/vmlinuz-lts.efi
#cp ${work_dir}/iso/${install_dir}/boot/${arch}/archiso-lts.img ${work_dir}/efiboot/EFI/archiso/archiso-lts.img
#fi
cp ${work_dir}/${arch}/airootfs/usr/share/efitools/efi/PreLoader.efi ${work_dir}/efiboot/EFI/boot/bootx64.efi

3
packages_cinnamon.txt
View file

@ -90,9 +90,8 @@ noto-fonts
noto-fonts-emoji
ntfs-3g
ntp
nvidia-dkms
nvidia
nvidia-libgl
nvidia-lts
nvidia-settings
nvidia-utils
onboard

3
packages_gnome.txt
View file

@ -89,9 +89,8 @@ noto-fonts
noto-fonts-emoji
ntfs-3g
ntp
nvidia-dkms
nvidia
nvidia-libgl
nvidia-lts
nvidia-settings
nvidia-utils
onboard

3
packages_kde.txt
View file

@ -87,9 +87,8 @@ noto-fonts
noto-fonts-emoji
ntfs-3g
ntp
nvidia-dkms
nvidia
nvidia-libgl
nvidia-lts
nvidia-settings
nvidia-utils
onboard

3
packages_libre.txt
View file

@ -80,9 +80,8 @@ noto-fonts
noto-fonts-emoji
ntfs-3g
ntp
nvidia-dkms
nvidia
nvidia-libgl
nvidia-lts
nvidia-settings
nvidia-utils
opencl-nvidia

3
packages_lxde.txt
View file

@ -85,9 +85,8 @@ noto-fonts
noto-fonts-emoji
ntfs-3g
ntp
nvidia-dkms
nvidia
nvidia-libgl
nvidia-lts
nvidia-settings
nvidia-utils
onboard

3
packages_lxqt.txt
View file

@ -87,9 +87,8 @@ noto-fonts
noto-fonts-emoji
ntfs-3g
ntp
nvidia-dkms
nvidia
nvidia-libgl
nvidia-lts
nvidia-settings
nvidia-utils
onboard

3
packages_mate.txt
View file

@ -87,9 +87,8 @@ noto-fonts
noto-fonts-emoji
ntfs-3g
ntp
nvidia-dkms
nvidia
nvidia-libgl
nvidia-lts
nvidia-settings
nvidia-utils
onboard

3
packages_voll.txt
View file

@ -140,9 +140,8 @@ noto-fonts
noto-fonts-emoji
ntfs-3g
ntp
nvidia-dkms
nvidia
nvidia-libgl
nvidia-lts
nvidia-settings
nvidia-utils
obs-studio

3
packages_xfce4.txt
View file

@ -84,9 +84,8 @@ noto-fonts
noto-fonts-emoji
ntfs-3g
ntp
nvidia-dkms
nvidia
nvidia-libgl
nvidia-lts
nvidia-settings
nvidia-utils
onboard

2
releng/archiso-x86_64-cd-default-nvidia.conf → releng/all/archiso-x86_64-cd-default-nvidia.conf
View file

@ -1,4 +1,4 @@
# default
# default nvidia
title %ISO_LABEL% %arch% UEFI DVD DEFAULT NVIDIA
linux /EFI/archiso/vmlinuz-lts.efi
initrd /EFI/archiso/archiso-lts.img

2
releng/archiso-x86_64-usb-default-nvidia.conf → releng/all/archiso-x86_64-usb-default-nvidia.conf
View file

@ -1,4 +1,4 @@
# default
# default nvidia
title %ISO_LABEL% %arch% UEFI USB DEFAULT NVIDIA
linux /%INSTALL_DIR%/boot/%arch%/vmlinuz-lts
initrd /%INSTALL_DIR%/boot/%arch%/archiso-lts.img

10
syslinux-standart.cfg
View file

@ -34,11 +34,11 @@ INITRD /%INSTALL_DIR%/boot/%arch%/archiso.img
APPEND archisolabel=%ISO_LABEL% format=y formatdevice=/dev/sda formatpartition=3
# default nvidia
LABEL arch
MENU LABEL %ISO_LABEL% DEFAULT NVIDIA
LINUX /%INSTALL_DIR%/boot/%arch%/vmlinuz-lts
INITRD /%INSTALL_DIR%/boot/%arch%/archiso-lts.img
APPEND archisolabel=%ISO_LABEL% cow_spacesize=1024M nvidia=y nvidia-drm.modeset=1 quiet splash
#LABEL arch
#MENU LABEL %ISO_LABEL% DEFAULT NVIDIA
#LINUX /%INSTALL_DIR%/boot/%arch%/vmlinuz-lts
#INITRD /%INSTALL_DIR%/boot/%arch%/archiso-lts.img
#APPEND archisolabel=%ISO_LABEL% cow_spacesize=1024M nvidia=y nvidia-drm.modeset=1 quiet splash
# default checksum
LABEL arch

10
syslinux.cfg
View file

@ -83,11 +83,11 @@ INITRD /%INSTALL_DIR%/boot/%arch%/archiso.img
APPEND archisolabel=%ISO_LABEL% format=y formatdevice=/dev/sda formatpartition=3
# default nvidia
LABEL arch
MENU LABEL %ISO_LABEL% DEFAULT NVIDIA
LINUX /%INSTALL_DIR%/boot/%arch%/vmlinuz-lts
INITRD /%INSTALL_DIR%/boot/%arch%/archiso-lts.img
APPEND archisolabel=%ISO_LABEL% cow_spacesize=1024M nvidia=y nvidia-drm.modeset=1 quiet splash
#LABEL arch
#MENU LABEL %ISO_LABEL% DEFAULT NVIDIA
#LINUX /%INSTALL_DIR%/boot/%arch%/vmlinuz-lts
#INITRD /%INSTALL_DIR%/boot/%arch%/archiso-lts.img
#APPEND archisolabel=%ISO_LABEL% cow_spacesize=1024M nvidia=y nvidia-drm.modeset=1 quiet splash
# default checksum
LABEL arch