From a2d73c44b82b4fb0ef07b073f7446aa09feda01e Mon Sep 17 00:00:00 2001
From: simono41 <simono41>
Date: Wed, 25 Apr 2018 12:30:54 +0200
Subject: [PATCH] fix

---
 arch-graphical-install-auto | 4 +++-
 make_mksquashfs-auto.sh     | 4 ++--
 packages_libre.txt          | 1 +
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/arch-graphical-install-auto b/arch-graphical-install-auto
index e8351ac..f93b769 100755
--- a/arch-graphical-install-auto
+++ b/arch-graphical-install-auto
@@ -528,7 +528,9 @@ cp /opt/${repo}/mimeapps.list /etc/xdg/mimeapps.list
 cp /opt/${repo}/aurinstall.sh /usr/bin/aurinstaller
 chmod +x /usr/bin/aurinstaller
 
-su "$username" -c "aurinstaller "https://aur.archlinux.org/plymouth.git""
+if [ "${version}" != "libre" ]; then
+  su "$username" -c "aurinstaller "https://aur.archlinux.org/plymouth.git""
+fi
 su "$username" -c "aurinstaller "https://aur.archlinux.org/plymouth-theme-dark-arch.git""
 plymouth-set-default-theme -R dark-arch
 
diff --git a/make_mksquashfs-auto.sh b/make_mksquashfs-auto.sh
index ae48a83..f2e4473 100755
--- a/make_mksquashfs-auto.sh
+++ b/make_mksquashfs-auto.sh
@@ -136,7 +136,7 @@ function system() {
 
             if [ "${version}" == "libre" ] || [ "${version}" == "lite" ]; 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 archiso block filesystems keyboard\"" >> ${work_dir}/${arch}/airootfs/etc/mkinitcpio.conf
+                echo "HOOKS=\"base udev plymouth 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
 
@@ -147,7 +147,7 @@ function system() {
                 #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.conf
-                echo "HOOKS=\"base udev archiso block filesystems keyboard\"" >> ${work_dir}/${arch}/airootfs/etc/mkinitcpio.conf
+                echo "HOOKS=\"base udev plymouth 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 /etc/modprobe.d/blacklist_nouveau.conf\"" >> ${work_dir}/${arch}/airootfs/etc/mkinitcpio.conf
 
diff --git a/packages_libre.txt b/packages_libre.txt
index 54f94d1..b12a94f 100644
--- a/packages_libre.txt
+++ b/packages_libre.txt
@@ -86,6 +86,7 @@ os-prober
 p7zip
 pavucontrol
 pixz
+plymouth
 ppp
 pulseaudio
 pulseaudio-alsa