From fc545333fce360f8bdb3c3296209d3537468e6db Mon Sep 17 00:00:00 2001 From: Bernhard Landauer Date: Mon, 7 May 2018 21:11:58 +0200 Subject: [PATCH] resolve conflict --- community/awesome/profile.conf | 2 +- community/bspwm-mate/profile.conf | 2 +- community/bspwm/profile.conf | 2 +- community/budgie/profile.conf | 2 +- community/lxde/profile.conf | 2 +- community/lxqt/profile.conf | 2 +- community/mate/profile.conf | 2 +- community/openbox/profile.conf | 2 +- community/webdad/profile.conf | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/community/awesome/profile.conf b/community/awesome/profile.conf index 54e2b105..588a7fda 100755 --- a/community/awesome/profile.conf +++ b/community/awesome/profile.conf @@ -24,7 +24,7 @@ chrootcfg="false" # unset defaults to given values # names must match systemd service names -enable_systemd=('cronie' 'ModemManager' 'NetworkManager' 'tlp' 'tlp-sleep' 'systemd-fsck@' 'systemd-fsck-root' 'avahi-daemon' 'add-autologin-group') +enable_systemd=('cronie' 'ModemManager' 'NetworkManager' 'tlp' 'tlp-sleep' 'systemd-fsck@' 'systemd-fsck-root' 'avahi-daemon' 'add-autologin-group' 'haveged') disable_systemd=('pacman-init') # unset defaults to given values, diff --git a/community/bspwm-mate/profile.conf b/community/bspwm-mate/profile.conf index 7e3c4585..89cebb8c 100755 --- a/community/bspwm-mate/profile.conf +++ b/community/bspwm-mate/profile.conf @@ -24,7 +24,7 @@ chrootcfg="false" # unset defaults to given values # names must match systemd service names -enable_systemd=('cronie' 'ModemManager' 'NetworkManager' 'tlp' 'tlp-sleep' 'avahi-daemon' 'add-autologin-group') +enable_systemd=('cronie' 'ModemManager' 'NetworkManager' 'tlp' 'tlp-sleep' 'avahi-daemon' 'add-autologin-group' 'haveged') disable_systemd=('pacman-init') # unset defaults to given values, diff --git a/community/bspwm/profile.conf b/community/bspwm/profile.conf index 7a208421..d0e0308d 100755 --- a/community/bspwm/profile.conf +++ b/community/bspwm/profile.conf @@ -24,7 +24,7 @@ chrootcfg="false" # unset defaults to given values # names must match systemd service names -enable_systemd=('cronie' 'ModemManager' 'NetworkManager' 'tlp' 'tlp-sleep' 'systemd-fsck@' 'systemd-fsck-root') +enable_systemd=('cronie' 'ModemManager' 'NetworkManager' 'tlp' 'tlp-sleep' 'systemd-fsck@' 'systemd-fsck-root' 'haveged') disable_systemd=('pacman-init') # unset defaults to given values, diff --git a/community/budgie/profile.conf b/community/budgie/profile.conf index e58fa2b1..75ca33d4 100644 --- a/community/budgie/profile.conf +++ b/community/budgie/profile.conf @@ -33,7 +33,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') + enable_systemd=('bluetooth' 'cronie' 'ModemManager' 'NetworkManager' 'org.cups.cupsd' 'tlp' 'tlp-sleep' 'avahi-daemon' 'add-autologin-group' 'haveged') # disable_systemd=() # unset defaults to given values, diff --git a/community/lxde/profile.conf b/community/lxde/profile.conf index c4a8df08..564e3ffd 100644 --- a/community/lxde/profile.conf +++ b/community/lxde/profile.conf @@ -36,7 +36,7 @@ geoip="true" # unset defaults to given values # names must match systemd service names # enable_systemd=('bluetooth' 'cronie' 'ModemManager' 'NetworkManager' 'org.cups.cupsd' 'tlp' 'tlp-sleep') -enable_systemd=('bluetooth' 'cronie' 'ModemManager' 'NetworkManager' 'org.cups.cupsd' 'tlp' 'tlp-sleep' 'ufw') +enable_systemd=('bluetooth' 'cronie' 'ModemManager' 'NetworkManager' 'org.cups.cupsd' 'tlp' 'tlp-sleep' 'ufw' 'haveged') disable_systemd=('pacman-init') # unset defaults to given values, diff --git a/community/lxqt/profile.conf b/community/lxqt/profile.conf index ca67d65a..de268f2d 100644 --- a/community/lxqt/profile.conf +++ b/community/lxqt/profile.conf @@ -42,7 +42,7 @@ chrootcfg="true" # unset defaults to given values # names must match systemd service names -enable_systemd=('bluetooth' 'cronie' 'ModemManager' 'NetworkManager' 'tlp' 'tlp-sleep') +enable_systemd=('bluetooth' 'cronie' 'ModemManager' 'NetworkManager' 'tlp' 'tlp-sleep' 'haveged') # disable_systemd=('pacman-init') diff --git a/community/mate/profile.conf b/community/mate/profile.conf index dde70a02..4ef386b9 100644 --- a/community/mate/profile.conf +++ b/community/mate/profile.conf @@ -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') + enable_systemd=('bluetooth' 'cronie' 'ModemManager' 'NetworkManager' 'org.cups.cupsd' 'tlp' 'tlp-sleep' 'avahi-daemon' 'add-autologin-group' 'haveged') # disable_systemd=() # unset defaults to given values, diff --git a/community/openbox/profile.conf b/community/openbox/profile.conf index 3db82c53..308b45e7 100644 --- a/community/openbox/profile.conf +++ b/community/openbox/profile.conf @@ -33,7 +33,7 @@ geoip='true' # unset defaults to given values # names must match systemd service names -enable_systemd=('avahi-daemon' 'bluetooth' 'cronie' 'ModemManager' 'NetworkManager' 'org.cups.cupsd' 'tlp' 'tlp-sleep') +enable_systemd=('avahi-daemon' 'bluetooth' 'cronie' 'ModemManager' 'NetworkManager' 'org.cups.cupsd' 'tlp' 'tlp-sleep' 'haveged') disable_systemd=('pacman-init') # unset defaults to given values, diff --git a/community/webdad/profile.conf b/community/webdad/profile.conf index c080b70b..8ed29ed3 100644 --- a/community/webdad/profile.conf +++ b/community/webdad/profile.conf @@ -32,7 +32,7 @@ extra="true" # unset defaults to given values # names must match systemd service names -enable_systemd=('avahi-daemon' 'bluetooth' 'cronie' 'ModemManager' 'NetworkManager' 'org.cups.cupsd' 'tlp' 'tlp-sleep' 'irqbalance' 'preload' 'ufw') +enable_systemd=('avahi-daemon' 'bluetooth' 'cronie' 'ModemManager' 'NetworkManager' 'org.cups.cupsd' 'tlp' 'tlp-sleep' 'irqbalance' 'preload' 'ufw' 'haveged') disable_systemd=('pacman-init') # unset defaults to given values,