From 4c5c5ffe9235dcdc05c9bfee59373bcc29510de1 Mon Sep 17 00:00:00 2001
From: simono41 <simono41>
Date: Wed, 2 May 2018 21:45:13 +0200
Subject: [PATCH] fix

---
 make_mksquashfs-auto.sh |  2 ++
 pacman.conf_manjaro     | 33 ++++++++++++++++++---------------
 2 files changed, 20 insertions(+), 15 deletions(-)

diff --git a/make_mksquashfs-auto.sh b/make_mksquashfs-auto.sh
index 46c0687..0077736 100755
--- a/make_mksquashfs-auto.sh
+++ b/make_mksquashfs-auto.sh
@@ -53,8 +53,10 @@ function minimalinstallation() {
     pacman-key --init
 
     if [ "${version}" == "libre" ]; then
+        pacman -U --noconfirm --force https://www.parabola.nu/packages/libre/any/parabola-keyring/download
         ./pacstrap -C pacman.conf_libre -c -d -G -M ${work_dir}/${arch}/airootfs $(cat base_libre.txt)
     elif [ "${version}" == "manjaro" ]; then
+        pacman -U --noconfirm --force https://mirror.philpot.de/manjaro/stable/core/x86_64/manjaro-keyring-20171027-2-any.pkg.tar.xz
         ./pacstrap -C pacman.conf_manjaro -c -d -G -M ${work_dir}/${arch}/airootfs $(cat base_manjaro.txt)
     else
         ./pacstrap -C pacman.conf -c -d -G -M ${work_dir}/${arch}/airootfs $(cat base.txt)
diff --git a/pacman.conf_manjaro b/pacman.conf_manjaro
index 5a99187..f725931 100644
--- a/pacman.conf_manjaro
+++ b/pacman.conf_manjaro
@@ -11,15 +11,15 @@
 # If you wish to use different paths, uncomment and update the paths.
 #RootDir     = /
 #DBPath      = /var/lib/pacman/
-CacheDir = /var/cache/pacman/pkg/
+#CacheDir    = /var/cache/pacman/pkg/
 #LogFile     = /var/log/pacman.log
 #GPGDir      = /etc/pacman.d/gnupg/
 #HookDir     = /etc/pacman.d/hooks/
-HoldPkg      = pacman glibc manjaro-system
-# If upgrades are available for these packages they will be asked for first
-#SyncFirst    = manjaro-system archlinux-keyring manjaro-keyring
-#XferCommand = /usr/bin/curl -C - -f %u > %o
-#XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u
+HoldPkg     = pacman glibc
+#XferCommand = /usr/bin/curl -4 -v -C - -f %u > %o
+#XferCommand = /usr/bin/wget -4 --passive-ftp -c -t 0 -O %o %u
+#XferCommand = /usr/bin/snarf -N %u
+#XferCommand = /usr/bin/aria2c --allow-overwrite=true --continue=true --file-allocation=none --log-level=error --max-tries=2 --max-connection-per-server=2 --max-file-not-found=5 --min-split-size=5M --no-conf --remote-time=true --summary-interval=60 --timeout=5 --dir=/ --out %o %u
 #CleanMethod = KeepInstalled
 #UseDelta    = 0.7
 Architecture = auto
@@ -33,9 +33,8 @@ Architecture = auto
 
 # Misc options
 #UseSyslog
-#Color
+Color
 #TotalDownload
-# We cannot check disk space from within a chroot environment
 CheckSpace
 #VerbosePkgLists
 
@@ -46,8 +45,8 @@ LocalFileSigLevel = Optional
 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
-# packagers with `pacman-key --populate archlinux manjaro`.
+# keyring can then be populated with the keys of all official Arch Linux
+# packagers with `pacman-key --populate archlinux`.
 
 #
 # REPOSITORIES
@@ -72,23 +71,28 @@ RemoteFileSigLevel = Never
 # repo name header and Include lines. You can add preferred servers immediately
 # after the header, and they will be used before the default mirrors.
 
+#[testing]
+#Include = /etc/pacman.d/mirrorlist
+
 [core]
-SigLevel = PackageRequired
 Include = /etc/pacman.d/mirrorlist_manjaro
 
 [extra]
-SigLevel = PackageRequired
 Include = /etc/pacman.d/mirrorlist_manjaro
 
+#[community-testing]
+#Include = /etc/pacman.d/mirrorlist
+
 [community]
-SigLevel = PackageRequired
 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-testing]
+#Include = /etc/pacman.d/mirrorlist
+
 [multilib]
-SigLevel = PackageRequired
 Include = /etc/pacman.d/mirrorlist_manjaro
 
 # An example of a custom package repository.  See the pacman manpage for
@@ -96,4 +100,3 @@ Include = /etc/pacman.d/mirrorlist_manjaro
 #[custom]
 #SigLevel = Optional TrustAll
 #Server = file:///home/custompkgs
-