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

nvidia-fix

Browse source
This commit is contained in:
simono41 2018-04-02 04:44:41 +02:00
parent 2df801d1f9
commit 05d35bc712
13 changed files with 87 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
arch-graphical-install-auto
View file

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

22
arch-install
View file

@ -288,12 +288,22 @@ function installation {
echo ""
if [ "${version}" == "libre" ]; then
echo "MODULES=\"i915 radeon nouveau ata_generic ata_piix nls_cp437 vfat ext4 btrfs\"" > ${mountpoint}/etc/mkinitcpio.conf
else
echo "MODULES=\"nvidia nvidia_modeset nvidia_uvm nvidia_drm i915 radeon ata_generic ata_piix nls_cp437 vfat ext4 btrfs\"" > ${mountpoint}/etc/mkinitcpio.conf
fi
echo "HOOKS=\"${parameter}\"" >> ${mountpoint}/etc/mkinitcpio.conf
echo "COMPRESSION=\"lz4\"" >> ${mountpoint}/etc/mkinitcpio.conf
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 "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
fi
echo ""
echo "blacklist floppy" > ${mountpoint}/etc/modprobe.d/blacklist-floppy.conf
echo "blacklist nouveau" > ${mountpoint}/etc/modprobe.d/blacklist_nouveau.conf
@ -1005,7 +1015,8 @@ then
if [ "${version}" == "libre" ]; then
arch-chroot ${mountpoint} mkinitcpio -p linux-libre
else
arch-chroot ${mountpoint} mkinitcpio -p linux
arch-chroot ${mountpoint} mkinitcpio -p linux -c /etc/mkinitcpio.conf
arch-chroot ${mountpoint} mkinitcpio -p linux-lts -c /etc/mkinitcpio-lts.conf
fi
echo ""
if [ "${boot}" == "grub" ]
@ -1035,7 +1046,8 @@ elif [ "${Partition}" == "bios" ]; then
if [ "${version}" == "libre" ]; then
arch-chroot ${mountpoint} mkinitcpio -p linux-libre
else
arch-chroot ${mountpoint} mkinitcpio -p linux
arch-chroot ${mountpoint} mkinitcpio -p linux -c /etc/mkinitcpio.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

15
find_and_delete.sh Executable file
View file

@ -0,0 +1,15 @@
#!/bin/bash
set -ex
wort=${1}
shift
ersetzen=${1}
shift
while (( "$(expr $#)" ))
do
sed "s|${wort}|${ersetzen}|g;" $1 > tempdatei
mv tempdatei $1
shift
done

33
make_mksquashfs-auto.sh
View file

@ -96,12 +96,21 @@ function filesystem() {
if [ "${version}" == "libre" ]; then
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 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
else
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
fi
echo "COMPRESSION=\"lz4\"" >> ${work_dir}/${arch}/airootfs/etc/mkinitcpio.conf
echo "FILES=\"/etc/modprobe.d/blacklist-floppy.conf /etc/modprobe.d/blacklist_nouveau.conf\"" >> ${work_dir}/${arch}/airootfs/etc/mkinitcpio.conf
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 "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
fi
# hooks
cp -v install/archiso* ${work_dir}/${arch}/airootfs/usr/lib/initcpio/install/
@ -171,8 +180,15 @@ function BIOS() {
mkdir -p ${work_dir}/iso/${install_dir}/boot/syslinux
cp -R ${work_dir}/${arch}/airootfs/usr/lib/syslinux/bios/* ${work_dir}/iso/${install_dir}/boot/syslinux/
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
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/
cp ${work_dir}/${arch}/airootfs/usr/lib/syslinux/bios/ldlinux.c32 ${work_dir}/iso/isolinux/
@ -228,7 +244,7 @@ function UEFI() {
echo "efiboot.img nicht vorhanden!"
fi
truncate -s 256M ${work_dir}/iso/EFI/archiso/efiboot.img
truncate -s 512M ${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
@ -242,6 +258,11 @@ 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
cp ${work_dir}/${arch}/airootfs/usr/share/efitools/efi/PreLoader.efi ${work_dir}/efiboot/EFI/boot/bootx64.efi
cp ${work_dir}/${arch}/airootfs/usr/share/efitools/efi/HashTool.efi ${work_dir}/efiboot/EFI/boot/

3
packages_cinnamon.txt
View file

@ -18,10 +18,13 @@ blueman
bmon
brasero
btrfs-progs
bumblebee
cdrtools
cinnamon
cmake
cronie
cuda
cudnn
cups
dbus
dialog

3
packages_gnome.txt
View file

@ -18,9 +18,12 @@ blueman
bmon
brasero
btrfs-progs
bumblebee
cdrtools
cmake
cronie
cuda
cudnn
cups
dbus
dialog

3
packages_kde.txt
View file

@ -18,9 +18,12 @@ blueman
bmon
brasero
btrfs-progs
bumblebee
cdrtools
cmake
cronie
cuda
cudnn
cups
dbus
dialog

3
packages_libre.txt
View file

@ -11,9 +11,12 @@ base-devel
bash-completion
blueman
btrfs-progs
bumblebee
cdrtools
cmake
cronie
cuda
cudnn
cups
dbus
dialog

3
packages_lxde.txt
View file

@ -18,9 +18,12 @@ blueman
bmon
brasero
btrfs-progs
bumblebee
cdrtools
cmake
cronie
cuda
cudnn
cups
dbus
dialog

3
packages_lxqt.txt
View file

@ -19,9 +19,12 @@ bmon
brasero
breeze-icons
btrfs-progs
bumblebee
cdrtools
cmake
cronie
cuda
cudnn
cups
dbus
dialog

3
packages_mate.txt
View file

@ -18,9 +18,12 @@ blueman
bmon
brasero
btrfs-progs
bumblebee
cdrtools
cmake
cronie
cuda
cudnn
cups
dbus
dialog

3
packages_voll.txt
View file

@ -28,6 +28,7 @@ boost
brasero
breeze-icons
btrfs-progs
bumblebee
bzr
calibre
cdrtools
@ -35,6 +36,8 @@ chromium
cinnamon
cmake
cronie
cuda
cudnn
cups
dbus
dialog

3
packages_xfce4.txt
View file

@ -18,9 +18,12 @@ blueman
bmon
brasero
btrfs-progs
bumblebee
cdrtools
cmake
cronie
cuda
cudnn
cups
dbus
dialog