diff --git a/base.txt b/base.txt index c688fe5..dd29366 100755 --- a/base.txt +++ b/base.txt @@ -1,5 +1,6 @@ acpid arch-install-scripts +archlinux-keyring avahi base base-devel diff --git a/base_libre.txt b/base_libre.txt index 6f38f6f..f00a4a2 100755 --- a/base_libre.txt +++ b/base_libre.txt @@ -1,5 +1,6 @@ acpid arch-install-scripts +archlinux-keyring avahi base base-devel @@ -31,6 +32,7 @@ ntp openssh openvpn os-prober +parabola-keyring pixz ppp screen diff --git a/base_manjaro.txt b/base_manjaro.txt new file mode 100755 index 0000000..60b90bb --- /dev/null +++ b/base_manjaro.txt @@ -0,0 +1,48 @@ +acpid +arch-install-scripts +archlinux-keyring +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 +intel-ucode +iw +links +manjaro-keyring +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 8b7a894..46c0687 100755 --- a/make_mksquashfs-auto.sh +++ b/make_mksquashfs-auto.sh @@ -55,7 +55,7 @@ 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) + ./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) fi diff --git a/pacman.conf_manjaro b/pacman.conf_manjaro index 26765e4..5a99187 100644 --- a/pacman.conf_manjaro +++ b/pacman.conf_manjaro @@ -17,7 +17,7 @@ CacheDir = /var/cache/pacman/pkg/ #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 +#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 #CleanMethod = KeepInstalled