From 6dd15fdf5ee13173f0e84cdcf62fea87e2c60a5b Mon Sep 17 00:00:00 2001
From: simono41 <simono41>
Date: Wed, 2 May 2018 19:19:28 +0000
Subject: [PATCH] fix

---
 arch-graphical-install-auto |  9 +++++----
 make_mksquashfs-auto.sh     |  2 ++
 mirrorlist_manjaro          | 34 +++++++++++++++++++++++-----------
 pacman.conf_manjaro         | 12 ++++++------
 4 files changed, 36 insertions(+), 21 deletions(-)

diff --git a/arch-graphical-install-auto b/arch-graphical-install-auto
index e8351ac..7d41d3e 100755
--- a/arch-graphical-install-auto
+++ b/arch-graphical-install-auto
@@ -306,10 +306,15 @@ systemctl enable startup.service
 # pacman-config
 if [ "${version}" == "libre" ]; then
     cp /opt/${repo}/pacman.conf_libre /etc/pacman.conf
+elif [ "${version}" == "manjaro" ]; then
+    cp /opt/${repo}/pacman.conf_manjaro /etc/pacman.conf
 else
     cp /opt/${repo}/pacman.conf /etc/pacman.conf
 fi
 
+# mirrorlist
+cp /opt/${repo}/mirrorlist* /etc/pacman.d/
+
 # new-config
 if [ -d /home/"$username"/.config ]; then
     rm -Rv /home/"$username"/.config
@@ -319,10 +324,6 @@ if [ -d /root/.config ]; then
     rm -Rv /root/.config
 fi
 
-# mirrorlist
-cp /opt/${repo}/mirrorlist_libre /etc/pacman.d/mirrorlist_libre
-cp /opt/${repo}/mirrorlist /etc/pacman.d/mirrorlist
-
 if [ -f /var/lib/pacman/db.lck ];then
     rm /var/lib/pacman/db.lck
 fi
diff --git a/make_mksquashfs-auto.sh b/make_mksquashfs-auto.sh
index 373a2f4..3d7cef2 100755
--- a/make_mksquashfs-auto.sh
+++ b/make_mksquashfs-auto.sh
@@ -53,6 +53,8 @@ function minimalinstallation() {
 
     if [ "${version}" == "libre" ]; then
         ./pacstrap -C pacman.conf_libre -c -d -G -M ${work_dir}/${arch}/airootfs $(cat base_libre.txt)
+    elif [ "${version}" == "manjaro" ]; then
+        ./pacstrap -C pacman.conf_manjaro -c -d -G -M ${work_dir}/${arch}/airootfs $(cat base.txt)
     else
         ./pacstrap -C pacman.conf -c -d -G -M ${work_dir}/${arch}/airootfs $(cat base.txt)
     fi
diff --git a/mirrorlist_manjaro b/mirrorlist_manjaro
index be846cc..1eb7088 100644
--- a/mirrorlist_manjaro
+++ b/mirrorlist_manjaro
@@ -1,23 +1,35 @@
 ##
 ## Manjaro Linux default mirrorlist
-## Generated on 2018-05-02 17:59
+## Generated on 2018-05-02 18:13
 ##
 ## Please use 'pacman-mirrors -f [NUMBER] NUMBER' to modify mirrorlist
 ## (Use 0 for all mirrors)
 ##
 
-## Country : United_Kingdom
-Server = https://www.mirrorservice.org/sites/repo.manjaro.org/repos/stable/$repo/$arch
+## Country : Germany
+Server = https://mirror.philpot.de/manjaro/stable/$repo/$arch
 
-## Country : Greece
-Server = https://ftp.cc.uoc.gr/mirrors/linux/manjaro/stable/$repo/$arch
+## Country : Germany
+Server = https://manjaro.moson.eu/stable/$repo/$arch
 
-## Country : Bulgaria
-Server = https://manjaro.ipacct.com/manjaro/stable/$repo/$arch
+## Country : Germany
+Server = https://mirror.netcologne.de/manjaro/stable/$repo/$arch
 
-## Country : United_States
-Server = https://mirror.math.princeton.edu/pub/manjaro/stable/$repo/$arch
+## Country : Germany
+Server = https://mirror.netzspielplatz.de/manjaro/packages/stable/$repo/$arch
 
-## Country : Philippines
-Server = http://mirror.rise.ph/manjaro/stable/$repo/$arch
+## Country : Germany
+Server = http://ftp.tu-chemnitz.de/pub/linux/manjaro/stable/$repo/$arch
+
+## Country : Germany
+Server = http://ftp.rz.tu-bs.de/pub/mirror/manjaro.org/repos/stable/$repo/$arch
+
+## Country : Germany
+Server = http://mirror.ragenetwork.de/manjaro/stable/$repo/$arch
+
+## Country : Germany
+Server = https://ftp.halifax.rwth-aachen.de/manjaro/stable/$repo/$arch
+
+## Country : Germany
+Server = https://repo.rhindon.net/manjaro/stable/$repo/$arch
 
diff --git a/pacman.conf_manjaro b/pacman.conf_manjaro
index faa4d32..26765e4 100644
--- a/pacman.conf_manjaro
+++ b/pacman.conf_manjaro
@@ -41,9 +41,9 @@ CheckSpace
 
 # By default, pacman accepts packages signed by keys that its local keyring
 # trusts (see pacman-key and its man page), as well as unsigned packages.
-SigLevel    = Required DatabaseOptional
+SigLevel    = Never
 LocalFileSigLevel = Optional
-#RemoteFileSigLevel = Required
+RemoteFileSigLevel = Never
 
 # NOTE: You must run `pacman-key --init` before first using pacman; the local
 # keyring can then be populated with the keys of all official Manjaro Linux
@@ -74,22 +74,22 @@ LocalFileSigLevel = Optional
 
 [core]
 SigLevel = PackageRequired
-Include = /etc/pacman.d/mirrorlist
+Include = /etc/pacman.d/mirrorlist_manjaro
 
 [extra]
 SigLevel = PackageRequired
-Include = /etc/pacman.d/mirrorlist
+Include = /etc/pacman.d/mirrorlist_manjaro
 
 [community]
 SigLevel = PackageRequired
-Include = /etc/pacman.d/mirrorlist
+Include = /etc/pacman.d/mirrorlist_manjaro
 
 # If you want to run 32 bit applications on your x86_64 system,
 # enable the multilib repositories as required here.
 
 [multilib]
 SigLevel = PackageRequired
-Include = /etc/pacman.d/mirrorlist
+Include = /etc/pacman.d/mirrorlist_manjaro
 
 # An example of a custom package repository.  See the pacman manpage for
 # tips on creating your own repositories.