diff --git a/arch-install b/arch-install index 65069c5..266190f 100755 --- a/arch-install +++ b/arch-install @@ -234,7 +234,7 @@ function installation { minimalinstallation fi - #kernel + # module and hooks parameter="base udev " if [ "${swap}" != "n" ]; then parameter="${parameter}resume " @@ -255,7 +255,11 @@ function installation { fi echo "" - echo "MODULES=\"i915 radeon ata_generic ata_piix nls_cp437 vfat ext4 btrfs\"" > ${mountpoint}/etc/mkinitcpio.conf + 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 + 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=\"${parameter}\"" >> ${mountpoint}/etc/mkinitcpio.conf echo "COMPRESSION=\"lz4\"" >> ${mountpoint}/etc/mkinitcpio.conf echo "FILES=\"/etc/modprobe.d/blacklist-floppy.conf\"" >> ${mountpoint}/etc/mkinitcpio.conf diff --git a/make_mksquashfs-auto.sh b/make_mksquashfs-auto.sh index d52a1ef..5c71b0f 100755 --- a/make_mksquashfs-auto.sh +++ b/make_mksquashfs-auto.sh @@ -94,7 +94,7 @@ function filesystem() { # module and hooks if [ "${version}" == "libre" ]; then - echo "MODULES=\"i915 radeon nouveau\"" > ${work_dir}/${arch}/airootfs/etc/mkinitcpio.conf + echo "MODULES=\"i915 radeon nouveau ata_generic ata_piix nls_cp437 vfat ext4 btrfs\"" > ${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