From 90bc1af3bf820a7d7b0841447bd90e9e7dd28493 Mon Sep 17 00:00:00 2001
From: simono41 <simono41>
Date: Tue, 1 May 2018 01:57:36 +0200
Subject: [PATCH] fix

---
 arch-graphical-install-auto |  6 +-----
 arch-install                | 20 ++++++++++++--------
 packages_libre.txt          |  1 -
 3 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/arch-graphical-install-auto b/arch-graphical-install-auto
index 36fb6e2..e8351ac 100755
--- a/arch-graphical-install-auto
+++ b/arch-graphical-install-auto
@@ -528,11 +528,7 @@ cp /opt/${repo}/mimeapps.list /etc/xdg/mimeapps.list
 cp /opt/${repo}/aurinstall.sh /usr/bin/aurinstaller
 chmod +x /usr/bin/aurinstaller
 
-if [ "${version}" != "libre" ]; then
-  su "$username" -c "aurinstaller "https://aur.archlinux.org/plymouth.git""
-else
-  cp /opt/${repo}/arch-logo.png /usr/share/plymouth/arch-logo.png
-fi
+su "$username" -c "aurinstaller "https://aur.archlinux.org/plymouth.git""
 su "$username" -c "aurinstaller "https://aur.archlinux.org/plymouth-theme-dark-arch.git""
 plymouth-set-default-theme -R dark-arch
 
diff --git a/arch-install b/arch-install
index 581f8bb..46c98c0 100755
--- a/arch-install
+++ b/arch-install
@@ -279,13 +279,25 @@ function installation {
 
     # module and hooks
     parameter="base udev "
+
+    if [ "${offline}" != "n" ]; then
+      if [ "${verschluesselung}" == "y" ]; then
+          parameter="${parameter}plymouth-encrypt "
+      else
+          parameter="${parameter}plymouth "
+      fi
+    fi
+
     if [ "${swap}" != "n" ]; then
         parameter="${parameter}resume "
     fi
+
     if [ "${verschluesselung}" == "y" ]; then
         parameter="${parameter}encrypt "
     fi
+
     parameter="${parameter}block filesystems keyboard "
+
     if [ "${dateisystem}" == "btrfs" ]; then
         if [ "${raid}" != "n" ]; then
             parameter="${parameter}btrfs "
@@ -296,14 +308,6 @@ function installation {
         parameter="${parameter}usbsecret "
     fi
 
-    if [ "${offline}" != "n" ]; then
-      if [ "${verschluesselung}" == "y" ]; then
-          parameter="${parameter}plymouth-encrypt "
-      else
-          parameter="${parameter}plymouth "
-      fi
-    fi
-
     echo ""
     if [ "${version}" == "libre" ] || [ "${offline}" == "n" ]; then
         echo "MODULES=\"i915 radeon nouveau ata_generic ata_piix nls_cp437 vfat ext4 btrfs\"" > ${mountpoint}/etc/mkinitcpio.conf
diff --git a/packages_libre.txt b/packages_libre.txt
index b12a94f..54f94d1 100644
--- a/packages_libre.txt
+++ b/packages_libre.txt
@@ -86,7 +86,6 @@ os-prober
 p7zip
 pavucontrol
 pixz
-plymouth
 ppp
 pulseaudio
 pulseaudio-alsa