From 42e6dab8c91fdb752af225a29b6a46e3eaabf996 Mon Sep 17 00:00:00 2001 From: simono41 Date: Sun, 4 Mar 2018 18:18:21 +0100 Subject: [PATCH] fix --- arch-install | 18 +++++++++--------- releng/archiso-x86_64-cd-default-nvidia.conf | 2 +- releng/archiso-x86_64-usb-default-nvidia.conf | 2 +- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/arch-install b/arch-install index 266190f..079b40f 100755 --- a/arch-install +++ b/arch-install @@ -339,15 +339,15 @@ function installation { if [ "${swap}" != "n" ]; then swappartition=$(blkid -s PARTUUID -o value ${device}${swappartitionnummer}) if [ "${usbkey}" == "y" ]; then - sed -i 's/GRUB_CMDLINE_LINUX=.*$/GRUB_CMDLINE_LINUX="cryptdevice=PARTUUID='$tobootdevice':luks0 resume=PARTUUID='$swappartition' cryptkey=UUID='$usbkeyuuid':'$usbkeydateisystem':\/archkey"/' ${mountpoint}/etc/default/grub + sed -i 's/GRUB_CMDLINE_LINUX=.*$/GRUB_CMDLINE_LINUX="cryptdevice=PARTUUID='$tobootdevice':luks0 resume=PARTUUID='$swappartition' cryptkey=UUID='$usbkeyuuid':'$usbkeydateisystem':\/archkey nvidia-drm.modeset=1"/' ${mountpoint}/etc/default/grub else - sed -i 's/GRUB_CMDLINE_LINUX=.*$/GRUB_CMDLINE_LINUX="cryptdevice=PARTUUID='$tobootdevice':luks0 resume=PARTUUID='$swappartition'"/' ${mountpoint}/etc/default/grub + sed -i 's/GRUB_CMDLINE_LINUX=.*$/GRUB_CMDLINE_LINUX="cryptdevice=PARTUUID='$tobootdevice':luks0 resume=PARTUUID='$swappartition' nvidia-drm.modeset=1"/' ${mountpoint}/etc/default/grub fi else if [ "${usbkey}" == "y" ]; then - sed -i 's/GRUB_CMDLINE_LINUX=.*$/GRUB_CMDLINE_LINUX="cryptdevice=PARTUUID='$tobootdevice':luks0 cryptkey=UUID='$usbkeyuuid':'$usbkeydateisystem':\/archkey"/' ${mountpoint}/etc/default/grub + sed -i 's/GRUB_CMDLINE_LINUX=.*$/GRUB_CMDLINE_LINUX="cryptdevice=PARTUUID='$tobootdevice':luks0 cryptkey=UUID='$usbkeyuuid':'$usbkeydateisystem':\/archkey nvidia-drm.modeset=1"/' ${mountpoint}/etc/default/grub else - sed -i 's/GRUB_CMDLINE_LINUX=.*$/GRUB_CMDLINE_LINUX="cryptdevice=PARTUUID='$tobootdevice':luks0"/' ${mountpoint}/etc/default/grub + sed -i 's/GRUB_CMDLINE_LINUX=.*$/GRUB_CMDLINE_LINUX="cryptdevice=PARTUUID='$tobootdevice':luks0 nvidia-drm.modeset=1"/' ${mountpoint}/etc/default/grub fi fi echo "GRUB_ENABLE_CRYPTODISK=y" >> ${mountpoint}/etc/default/grub @@ -357,7 +357,7 @@ function installation { tobootdevice=$(blkid -s PARTUUID -o value ${device}${rootpartitionnummer}) if [ "${swap}" != "n" ]; then swappartition=$(blkid -s PARTUUID -o value ${device}${swappartitionnummer}) - sed -i 's/GRUB_CMDLINE_LINUX=.*$/GRUB_CMDLINE_LINUX="resume=PARTUUID='$swappartition'"/' ${mountpoint}/etc/default/grub + sed -i 's/GRUB_CMDLINE_LINUX=.*$/GRUB_CMDLINE_LINUX="resume=PARTUUID='$swappartition' nvidia-drm.modeset=1"/' ${mountpoint}/etc/default/grub fi fi fi @@ -592,13 +592,13 @@ function systemdboot() { echo "linux /vmlinuz-linux" >> ${mountpoint}/boot/loader/entries/arch-uefi.conf echo "initrd /intel-ucode.img" >> ${mountpoint}/boot/loader/entries/arch-uefi.conf echo "initrd /initramfs-linux.img" >> ${mountpoint}/boot/loader/entries/arch-uefi.conf - echo "options root=${tobootdevice} rw ${parameter}" >> ${mountpoint}/boot/loader/entries/arch-uefi.conf + echo "options root=${tobootdevice} rw ${parameter}nvidia-drm.modeset=1" >> ${mountpoint}/boot/loader/entries/arch-uefi.conf echo "title "${repo}"" > ${mountpoint}/boot/loader/entries/arch-uefi-fallback.conf echo "linux /vmlinuz-linux" >> ${mountpoint}/boot/loader/entries/arch-uefi-fallback.conf echo "initrd /intel-ucode.img" >> ${mountpoint}/boot/loader/entries/arch-uefi-fallback.conf echo "initrd /initramfs-linux-fallback.img" >> ${mountpoint}/boot/loader/entries/arch-uefi-fallback.conf - echo "options root=${tobootdevice} rw ${parameter}" >> ${mountpoint}/boot/loader/entries/arch-uefi-fallback.conf + echo "options root=${tobootdevice} rw ${parameter}nvidia-drm.modeset=1" >> ${mountpoint}/boot/loader/entries/arch-uefi-fallback.conf echo "default arch-uefi" > ${mountpoint}/boot/loader/loader.conf echo "timeout 1" >> ${mountpoint}/boot/loader/loader.conf @@ -609,10 +609,10 @@ function systemdboot() { arch-chroot ${mountpoint} efibootmgr -c -d ${device} -p 1 -l /EFI/systemd/systemd-bootx64.efi -L "Linux Boot Manager" - 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}" + 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}nvidia-drm.modeset=1" # ü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}" + #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" #arch-chroot ${mountpoint} bootctl install diff --git a/releng/archiso-x86_64-cd-default-nvidia.conf b/releng/archiso-x86_64-cd-default-nvidia.conf index e765f90..d17f31d 100755 --- a/releng/archiso-x86_64-cd-default-nvidia.conf +++ b/releng/archiso-x86_64-cd-default-nvidia.conf @@ -1,5 +1,5 @@ # default -title %ISO_LABEL% %arch% UEFI DVD DEFAULT +title %ISO_LABEL% %arch% UEFI DVD DEFAULT NVIDIA linux /EFI/archiso/vmlinuz.efi initrd /EFI/archiso/archiso.img options archisobasedir=%INSTALL_DIR% archisolabel=%ISO_LABEL% cow_spacesize=1024M nvidia-drm.modeset=1 diff --git a/releng/archiso-x86_64-usb-default-nvidia.conf b/releng/archiso-x86_64-usb-default-nvidia.conf index 7ef6f58..43f5d02 100755 --- a/releng/archiso-x86_64-usb-default-nvidia.conf +++ b/releng/archiso-x86_64-usb-default-nvidia.conf @@ -1,5 +1,5 @@ # default -title %ISO_LABEL% %arch% UEFI USB DEFAULT +title %ISO_LABEL% %arch% UEFI USB DEFAULT NVIDIA linux /%INSTALL_DIR%/boot/%arch%/vmlinuz initrd /%INSTALL_DIR%/boot/%arch%/archiso.img options archisobasedir=%INSTALL_DIR% archisolabel=%ISO_LABEL% cow_spacesize=1024M nvidia-drm.modeset=1