From e1af5fa042342980692a7e1b32b9974766faba01 Mon Sep 17 00:00:00 2001
From: simono41 <simono41>
Date: Sun, 27 May 2018 02:51:22 +0200
Subject: [PATCH] fix

---
 arch-graphical-install-auto | 18 ++++++++++--------
 arch-install                | 31 +++++++++++++++++++++++++++++++
 2 files changed, 41 insertions(+), 8 deletions(-)

diff --git a/arch-graphical-install-auto b/arch-graphical-install-auto
index 312929a..ad8f412 100755
--- a/arch-graphical-install-auto
+++ b/arch-graphical-install-auto
@@ -157,6 +157,16 @@ ${userpass}
 EOT
     mkdir -p /home/"$username"/
     userrechte
+
+    # sudoers/wheel
+
+    echo "Lege $SUDOERS neu an!!!"
+
+    echo "root ALL=(ALL) NOPASSWD: ALL" > $SUDOERS
+
+    echo "%wheel ALL=(ALL) NOPASSWD: ALL" >> $SUDOERS
+
+
 }
 
 function copyconfig() {
@@ -287,14 +297,6 @@ fi
 
 gitclone
 
-# sudoers/wheel
-
-echo "Lege $SUDOERS neu an!!!"
-
-echo "root ALL=(ALL) NOPASSWD: ALL" > $SUDOERS
-
-echo "%wheel ALL=(ALL) NOPASSWD: ALL" >> $SUDOERS
-
 # Your commands
 
 # startup
diff --git a/arch-install b/arch-install
index 5f28932..fda51b2 100755
--- a/arch-install
+++ b/arch-install
@@ -28,11 +28,42 @@ function minimalinstallation() {
         pacstrap -c -d -G -M ${mountpoint} $(cat /opt/${repo}/base.txt)
     fi
 
+
+    # hooks
+    cp -v /opt/${repo}/install/archiso* ${mountpoint}/usr/lib/initcpio/install/
+    cp -v /opt/${repo}/hooks/archiso* ${mountpoint}/usr/lib/initcpio/hooks/
+
+    cp -v /opt/${repo}/script/archiso* ${mountpoint}/usr/lib/initcpio/
+
+    cp -v /opt/${repo}/install/cow_device ${mountpoint}/usr/lib/initcpio/install/
+    cp -v /opt/${repo}/hooks/cow_device ${mountpoint}/usr/lib/initcpio/hooks/
+
+    # scripts
+    cp /opt/${repo}/arch-graphical-install-auto ${mountpoint}/usr/bin/arch-graphical-install-auto
+    chmod +x ${mountpoint}/usr/bin/arch-graphical-install-auto
+
+    # mirrors
+
+    # pacman-config
+    if [ "${version}" == "libre" ]; then
+        cp /opt/${repo}/pacman.conf_libre ${mountpoint}/etc/pacman.conf
+    elif [ "${version}" == "manjaro" ]; then
+        cp /opt/${repo}/pacman.conf_manjaro ${mountpoint}/etc/pacman.conf
+    else
+        cp /opt/${repo}/pacman.conf ${mountpoint}/etc/pacman.conf
+    fi
+
+    # mirrorlist
+    cp /opt/${repo}/mirrorlist* ${mountpoint}/etc/pacman.d/
+
     # aurinstaller
     cp /opt/${repo}/aurinstall.sh ${mountpoint}/usr/bin/aurinstaller
     chmod +x ${mountpoint}/usr/bin/aurinstaller
 
+    echo "${name}´s_PC-${version}" > ${mountpoint}/etc/hostname
+
     arch-chroot ${mountpoint} arch-graphical-install-auto adduser user1 user1
+    arch-chroot ${mountpoint} pacman -Syu --needed --noconfirm
     arch-chroot ${mountpoint} su "$user" -c "aurinstaller "https://aur.archlinux.org/plymouth.git""
 
 }