From 46b2ff7e4e9228d8d88783d18fdc00c1620968e8 Mon Sep 17 00:00:00 2001 From: simono41 Date: Mon, 2 Apr 2018 05:57:35 +0200 Subject: [PATCH] deactivate_nvidia_dkms --- arch-graphical-install-auto | 2 +- arch-install | 46 +++++++++---------- make_mksquashfs-auto.sh | 32 ++++++------- packages_cinnamon.txt | 3 +- packages_gnome.txt | 3 +- packages_kde.txt | 3 +- packages_libre.txt | 3 +- packages_lxde.txt | 3 +- packages_lxqt.txt | 3 +- packages_mate.txt | 3 +- packages_voll.txt | 3 +- packages_xfce4.txt | 3 +- .../archiso-x86_64-cd-default-nvidia.conf | 2 +- .../archiso-x86_64-usb-default-nvidia.conf | 2 +- syslinux-standart.cfg | 10 ++-- syslinux.cfg | 10 ++-- 16 files changed, 61 insertions(+), 70 deletions(-) rename releng/{ => all}/archiso-x86_64-cd-default-nvidia.conf (93%) rename releng/{ => all}/archiso-x86_64-usb-default-nvidia.conf (94%) diff --git a/arch-graphical-install-auto b/arch-graphical-install-auto index 8adfc31..3d4bdf8 100755 --- a/arch-graphical-install-auto +++ b/arch-graphical-install-auto @@ -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!!!" diff --git a/arch-install b/arch-install index 4ff8d87..70e9def 100755 --- a/arch-install +++ b/arch-install @@ -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 diff --git a/make_mksquashfs-auto.sh b/make_mksquashfs-auto.sh index efdf7e4..d96b1e2 100755 --- a/make_mksquashfs-auto.sh +++ b/make_mksquashfs-auto.sh @@ -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 diff --git a/packages_cinnamon.txt b/packages_cinnamon.txt index 5136471..787b777 100644 --- a/packages_cinnamon.txt +++ b/packages_cinnamon.txt @@ -90,9 +90,8 @@ noto-fonts noto-fonts-emoji ntfs-3g ntp -nvidia-dkms +nvidia nvidia-libgl -nvidia-lts nvidia-settings nvidia-utils onboard diff --git a/packages_gnome.txt b/packages_gnome.txt index 114f87f..2aea6c0 100644 --- a/packages_gnome.txt +++ b/packages_gnome.txt @@ -89,9 +89,8 @@ noto-fonts noto-fonts-emoji ntfs-3g ntp -nvidia-dkms +nvidia nvidia-libgl -nvidia-lts nvidia-settings nvidia-utils onboard diff --git a/packages_kde.txt b/packages_kde.txt index 9ae4824..778d9cf 100644 --- a/packages_kde.txt +++ b/packages_kde.txt @@ -87,9 +87,8 @@ noto-fonts noto-fonts-emoji ntfs-3g ntp -nvidia-dkms +nvidia nvidia-libgl -nvidia-lts nvidia-settings nvidia-utils onboard diff --git a/packages_libre.txt b/packages_libre.txt index 0578b96..f4542cb 100644 --- a/packages_libre.txt +++ b/packages_libre.txt @@ -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 diff --git a/packages_lxde.txt b/packages_lxde.txt index ce1c008..b2dbb3d 100644 --- a/packages_lxde.txt +++ b/packages_lxde.txt @@ -85,9 +85,8 @@ noto-fonts noto-fonts-emoji ntfs-3g ntp -nvidia-dkms +nvidia nvidia-libgl -nvidia-lts nvidia-settings nvidia-utils onboard diff --git a/packages_lxqt.txt b/packages_lxqt.txt index 1e04cd9..27cb5dc 100644 --- a/packages_lxqt.txt +++ b/packages_lxqt.txt @@ -87,9 +87,8 @@ noto-fonts noto-fonts-emoji ntfs-3g ntp -nvidia-dkms +nvidia nvidia-libgl -nvidia-lts nvidia-settings nvidia-utils onboard diff --git a/packages_mate.txt b/packages_mate.txt index 5e63467..68e2f7b 100644 --- a/packages_mate.txt +++ b/packages_mate.txt @@ -87,9 +87,8 @@ noto-fonts noto-fonts-emoji ntfs-3g ntp -nvidia-dkms +nvidia nvidia-libgl -nvidia-lts nvidia-settings nvidia-utils onboard diff --git a/packages_voll.txt b/packages_voll.txt index f9d944b..34488ac 100644 --- a/packages_voll.txt +++ b/packages_voll.txt @@ -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 diff --git a/packages_xfce4.txt b/packages_xfce4.txt index cd2efb7..967e8a1 100644 --- a/packages_xfce4.txt +++ b/packages_xfce4.txt @@ -84,9 +84,8 @@ noto-fonts noto-fonts-emoji ntfs-3g ntp -nvidia-dkms +nvidia nvidia-libgl -nvidia-lts nvidia-settings nvidia-utils onboard diff --git a/releng/archiso-x86_64-cd-default-nvidia.conf b/releng/all/archiso-x86_64-cd-default-nvidia.conf similarity index 93% rename from releng/archiso-x86_64-cd-default-nvidia.conf rename to releng/all/archiso-x86_64-cd-default-nvidia.conf index 4034ad8..9c5ea2a 100644 --- a/releng/archiso-x86_64-cd-default-nvidia.conf +++ b/releng/all/archiso-x86_64-cd-default-nvidia.conf @@ -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 diff --git a/releng/archiso-x86_64-usb-default-nvidia.conf b/releng/all/archiso-x86_64-usb-default-nvidia.conf similarity index 94% rename from releng/archiso-x86_64-usb-default-nvidia.conf rename to releng/all/archiso-x86_64-usb-default-nvidia.conf index 09dba45..a930df7 100644 --- a/releng/archiso-x86_64-usb-default-nvidia.conf +++ b/releng/all/archiso-x86_64-usb-default-nvidia.conf @@ -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 diff --git a/syslinux-standart.cfg b/syslinux-standart.cfg index 47aeeaf..99ff0af 100644 --- a/syslinux-standart.cfg +++ b/syslinux-standart.cfg @@ -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 diff --git a/syslinux.cfg b/syslinux.cfg index 024168c..4972832 100644 --- a/syslinux.cfg +++ b/syslinux.cfg @@ -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