Merge remote-tracking branch 'upstream/master'

This commit is contained in:
fhdk 2018-04-30 11:40:40 +02:00
commit 2cb31a86d3
3 changed files with 6 additions and 2 deletions

View File

@ -24,6 +24,8 @@ konsole
# optional dependencies of ark: # optional dependencies of ark:
>extra p7zip >extra p7zip
>extra unarchiver >extra unarchiver
# wifi setup for systemd-networkd (recommended reading: https://wiki.archlinux.org/index.php/Systemd-networkd#Wireless_adapter and https://wiki.archlinux.org/index.php/WPA_supplicant)
#>extra wpa_supplicant_gui
## package manager ## package manager
>extra octopi >extra octopi

View File

@ -5,8 +5,6 @@ manjaro-live-systemd
grub-theme-live-manjaro grub-theme-live-manjaro
nbd nbd
mkinitcpio-nfs-utils mkinitcpio-nfs-utils
systemd-sysvcompat
licenses
## GUI installer ## GUI installer
calamares calamares

View File

@ -6,6 +6,10 @@ base
manjaro-system manjaro-system
mhwd mhwd
sudo sudo
## required packages
systemd-sysvcompat
licenses
KERNEL KERNEL
## boot loader ## boot loader