Merge remote-tracking branch 'upstream/master'

This commit is contained in:
Frede Hundewadt 2019-09-14 19:16:59 +02:00
commit 11f22f9fb3
No known key found for this signature in database
GPG Key ID: 7605992471F3F073
3 changed files with 4 additions and 1 deletions

View File

@ -120,6 +120,7 @@ sbxkb
screenfetch
>extra snapd
speedtest-cli
>basic squashfs-tools
>extra subversion
syslog-ng
terminus-font

View File

@ -68,6 +68,8 @@ manjaro-hotfixes
manjaro-pulse
manjaro-settings-manager-notifier
manjaro-hello
>extra bauh
>extra snapd
mesa-demos
mobile-broadband-provider-info
modemmanager

View File

@ -34,7 +34,7 @@ displaymanager="lightdm"
# unset defaults to given values
# names must match systemd service names
enable_systemd=('bluetooth' 'cronie' 'ModemManager' 'NetworkManager' 'org.cups.cupsd' 'tlp' 'tlp-sleep' 'avahi-daemon' 'add-autologin-group' 'haveged')
enable_systemd=('bluetooth' 'cronie' 'ModemManager' 'NetworkManager' 'org.cups.cupsd' 'tlp' 'tlp-sleep' 'avahi-daemon' 'add-autologin-group' 'haveged' 'apparmor' 'snapd.apparmor' 'snapd')
# disable_systemd=()
# unset defaults to given values,