diff --git a/make_mksquashfs-auto.sh b/make_mksquashfs-auto.sh index de23af5..d52a1ef 100755 --- a/make_mksquashfs-auto.sh +++ b/make_mksquashfs-auto.sh @@ -93,7 +93,11 @@ function filesystem() { fi # module and hooks - echo "MODULES=\"i915 radeon\"" > ${work_dir}/${arch}/airootfs/etc/mkinitcpio.conf + if [ "${version}" == "libre" ]; then + echo "MODULES=\"i915 radeon nouveau\"" > ${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 + fi 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\"" >> ${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 diff --git a/releng/archiso-x86_64-cd-default-nvidia.conf b/releng/archiso-x86_64-cd-default-nvidia.conf new file mode 100755 index 0000000..e765f90 --- /dev/null +++ b/releng/archiso-x86_64-cd-default-nvidia.conf @@ -0,0 +1,5 @@ +# default +title %ISO_LABEL% %arch% UEFI DVD DEFAULT +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 new file mode 100755 index 0000000..7ef6f58 --- /dev/null +++ b/releng/archiso-x86_64-usb-default-nvidia.conf @@ -0,0 +1,5 @@ +# default +title %ISO_LABEL% %arch% UEFI USB DEFAULT +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 diff --git a/syslinux-standart.cfg b/syslinux-standart.cfg index b1c8b14..c7dc035 100755 --- a/syslinux-standart.cfg +++ b/syslinux-standart.cfg @@ -26,6 +26,13 @@ LINUX /%INSTALL_DIR%/boot/%arch%/vmlinuz INITRD /%INSTALL_DIR%/boot/%arch%/archiso.img APPEND archisolabel=%ISO_LABEL% cow_label=cow_device copytoram=y +# default nvidia +LABEL arch +MENU LABEL %ISO_LABEL% DEFAULT +LINUX /%INSTALL_DIR%/boot/%arch%/vmlinuz +INITRD /%INSTALL_DIR%/boot/%arch%/archiso.img +APPEND archisolabel=%ISO_LABEL% cow_spacesize=1024M nvidia-drm.modeset=1 + # default checksum LABEL arch MENU LABEL %ISO_LABEL% DEFAULT Check disc for defects