From 2c302aae1772c3a0321f479a632d23694594273e Mon Sep 17 00:00:00 2001
From: simono41 <simono41>
Date: Wed, 25 Apr 2018 12:14:41 +0200
Subject: [PATCH] fix

---
 base_libre.txt          | 45 +++++++++++++++++++++++++++++++++++++++++
 make_mksquashfs-auto.sh |  8 ++++----
 2 files changed, 49 insertions(+), 4 deletions(-)
 create mode 100755 base_libre.txt

diff --git a/base_libre.txt b/base_libre.txt
new file mode 100755
index 0000000..6f38f6f
--- /dev/null
+++ b/base_libre.txt
@@ -0,0 +1,45 @@
+acpid
+arch-install-scripts
+avahi
+base
+base-devel
+bash-completion
+btrfs-progs
+cdrtools
+cmake
+cronie
+cups
+davfs2
+dbus
+dialog
+dosfstools
+efibootmgr
+efitools
+exfat-utils
+fail2ban
+fish
+gdisk
+git
+grub
+htop
+iw
+links
+mkinitcpio-nfs-utils
+nbd
+networkmanager
+ntp
+openssh
+openvpn
+os-prober
+pixz
+ppp
+screen
+squashfs-tools
+syslinux
+tar
+traceroute
+ufw
+wget
+wireless_tools
+wpa_supplicant
+xorriso
diff --git a/make_mksquashfs-auto.sh b/make_mksquashfs-auto.sh
index acc0481..ae48a83 100755
--- a/make_mksquashfs-auto.sh
+++ b/make_mksquashfs-auto.sh
@@ -56,15 +56,15 @@ function minimalinstallation() {
     fi
     if [ "${version}" == "libre" ]; then
         if [ "${archchroot}" != "y" ]; then
-            ./pacstrap -C /etc/pacman.conf_libre -c -i -d -G -M ${work_dir}/${arch}/airootfs $(cat base.txt) --ignore linux,intel-ucode
+            ./pacstrap -C pacman.conf_libre -c -i -d -G -M ${work_dir}/${arch}/airootfs $(cat base_libre.txt) --ignore linux
         else
-            ./pacstrap -C /etc/pacman.conf_libre -c -d -G -M ${work_dir}/${arch}/airootfs $(cat base.txt) --ignore intel-ucode
+            ./pacstrap -C pacman.conf_libre -c -d -G -M ${work_dir}/${arch}/airootfs $(cat base_libre.txt)
         fi
     else
         if [ "${archchroot}" != "y" ]; then
-            ./pacstrap -C /etc/pacman.conf -c -i -d -G -M ${work_dir}/${arch}/airootfs $(cat base.txt) --ignore linux
+            ./pacstrap -C pacman.conf -c -i -d -G -M ${work_dir}/${arch}/airootfs $(cat base.txt) --ignore linux
         else
-            ./pacstrap -C /etc/pacman.conf -c -d -G -M ${work_dir}/${arch}/airootfs $(cat base.txt)
+            ./pacstrap -C pacman.conf -c -d -G -M ${work_dir}/${arch}/airootfs $(cat base.txt)
         fi
     fi
 }