From a3a8b8efc68f2515bbed989cf384d0bb1f3a8c3f Mon Sep 17 00:00:00 2001 From: simono41 Date: Tue, 21 Aug 2018 23:04:37 +0200 Subject: [PATCH] fix --- arch-install | 14 +++++++++----- make_mksquashfs-auto.sh | 2 +- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/arch-install b/arch-install index 9d5b136..6172539 100755 --- a/arch-install +++ b/arch-install @@ -408,14 +408,18 @@ function installation { parameter="${parameter}usbsecret " fi - if [ "${verschluesselung}" == "y" ]; then - parameter="${parameter}plymouth-encrypt " - else - parameter="${parameter}plymouth " + if ! [ "${version}" == "libre" ] || [ "${version}" == "manjaro" ] || [ "${version}" == "lite" ]; then + + if [ "${verschluesselung}" == "y" ]; then + parameter="${parameter}plymouth-encrypt " + else + parameter="${parameter}plymouth " + fi + fi echo "" - if [ "${version}" == "libre" ] || [ "${version}" == "manjaro" ]; then + if [ "${version}" == "libre" ] || [ "${version}" == "manjaro" ] || [ "${version}" == "lite" ]; then echo "MODULES=\"nouveau 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 diff --git a/make_mksquashfs-auto.sh b/make_mksquashfs-auto.sh index 1dbfa00..8be350e 100755 --- a/make_mksquashfs-auto.sh +++ b/make_mksquashfs-auto.sh @@ -145,7 +145,7 @@ function system() { if [ "${version}" == "libre" ] || [ "${version}" == "lite" ] || [ "${version}" == "manjaro" ]; then echo "MODULES=\"nouveau i915 radeon ata_generic ata_piix nls_cp437 vfat ext4 btrfs\"" > ${work_dir}/${arch}/airootfs/etc/mkinitcpio.conf - echo "HOOKS=\"base udev archiso block filesystems keyboard plymouth\"" >> ${work_dir}/${arch}/airootfs/etc/mkinitcpio.conf + echo "HOOKS=\"base udev archiso block 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