diff --git a/README.md b/README.md index f081fb4..54c5dfe 100644 --- a/README.md +++ b/README.md @@ -48,7 +48,7 @@ iso-profiles # unset defaults to given values, # names must match openrc service names -# enable_openrc=('acpid' 'bluetooth' 'consolekit' 'cronie' 'cupsd' 'dbus' 'syslog-ng' 'NetworkManager') +# enable_openrc=('acpid' 'bluetooth' 'elogind' 'cronie' 'cupsd' 'dbus' 'syslog-ng' 'NetworkManager') # disable_openrc=() # unset defaults to given values diff --git a/community/architect/Packages-Live b/community/architect/Packages-Live index 92369b8..1c1e911 100644 --- a/community/architect/Packages-Live +++ b/community/architect/Packages-Live @@ -9,22 +9,20 @@ manjaro-hotfixes manjaro-syslinux-theme mkinitcpio-nfs-utils nbd ->openrc cgmanager-openrc ->openrc consolekit-openrc +>openrc elogind-openrc >openrc manjaro-live-openrc ->openrc networkmanager-consolekit >openrc networkmanager-openrc ->openrc pm-utils open-vm-tools >systemd manjaro-live-systemd ->systemd networkmanager +networkmanager >x86_64 manjaro-efi-utils terminus-font virtualbox-guest-utils xf86-input-elographics xf86-input-evdev xf86-input-keyboard -xf86-input-libinput +>systemd xf86-input-libinput +>openrc xf86-input-libinput-nosystemd xf86-input-mouse xf86-input-vmmouse xf86-input-void diff --git a/community/architect/profile.conf b/community/architect/profile.conf index 5af22e7..f87e1a6 100644 --- a/community/architect/profile.conf +++ b/community/architect/profile.conf @@ -8,7 +8,7 @@ hostname="manjaro-architect" enable_systemd=('bluetooth' 'cronie' 'ModemManager' 'NetworkManager' 'tlp' 'tlp-sleep') -enable_openrc=('acpid' 'cgmanager' 'consolekit' 'cronie' 'dbus' 'NetworkManager' 'syslog-ng') +enable_openrc=('acpid' 'elogind' 'cronie' 'dbus' 'NetworkManager' 'syslog-ng') enable_systemd_live=('manjaro-live' 'mirrors-live' 'pacman-init') diff --git a/community/bspwm/Packages-Desktop b/community/bspwm/Packages-Desktop index 208df23..8a092ef 100644 --- a/community/bspwm/Packages-Desktop +++ b/community/bspwm/Packages-Desktop @@ -50,11 +50,8 @@ ncdu networkmanager-dispatcher-ntpd >openrc acpid-openrc >openrc alsa-utils-openrc ->openrc cgmanager-openrc >openrc displaymanager-openrc ->openrc networkmanager-consolekit >openrc networkmanager-openrc ->openrc pm-utils pacli perl-file-mimeinfo poppler @@ -68,7 +65,7 @@ sxhkd >systemd alsa-utils >systemd maia-console >systemd delayed-hibernation ->systemd networkmanager +networkmanager >systemd openresolv >systemd xlogin terminus-font @@ -77,15 +74,14 @@ tmux udevil xcursor-breeze xdg-su -xdg-user-dirs xdg-utils xf86-input-elographics xf86-input-evdev xf86-input-keyboard -xf86-input-libinput +>systemd xf86-input-libinput +>openrc xf86-input-libinput-nosystemd xf86-input-mouse xf86-input-void -xorg-server xorg-server-utils xorg-xinit xorg-xprop @@ -94,3 +90,10 @@ zathura-pdf-poppler zenity zsh zsh-completions +>openrc accountsservice-elogind +>openrc upower-nosystemd +>openrc udisks2-elogind +>openrc xdg-user-dirs-nosystemd +>openrc xorg-server-nosystemd +>systemd xdg-user-dirs +>systemd xorg-server diff --git a/community/bspwm/profile.conf b/community/bspwm/profile.conf index b137757..e69c70e 100755 --- a/community/bspwm/profile.conf +++ b/community/bspwm/profile.conf @@ -31,7 +31,7 @@ disable_systemd=('pacman-init') # unset defaults to given values, # names must match openrc service names -# enable_openrc=('acpid' 'bluetooth' 'cgmanager' 'consolekit' 'cronie' 'cupsd' 'dbus' 'syslog-ng' 'NetworkManager' 'tlp' 'tlp-sleep' 'xdm') +# enable_openrc=('acpid' 'bluetooth' 'elogind' 'cronie' 'cupsd' 'dbus' 'syslog-ng' 'NetworkManager' 'tlp' 'tlp-sleep' 'xdm') # disable_openrc=() # the same workgroup name if samba is used diff --git a/community/budgie/Packages-Desktop b/community/budgie/Packages-Desktop index 4e147a5..5dca195 100644 --- a/community/budgie/Packages-Desktop +++ b/community/budgie/Packages-Desktop @@ -88,9 +88,11 @@ pulseaudio-bluetooth pulseaudio-ctl pulseaudio-zeroconf sushi +>systemd xdg-user-dirs +>systemd xorg-server >systemd alsa-utils >systemd avahi ->systemd networkmanager +networkmanager >systemd ntp >systemd openssh terminus-font @@ -110,16 +112,14 @@ budgie-wallpapers moka-icon-theme vino xdg-su -xdg-user-dirs xdg-user-dirs-gtk xdg-utils xf86-input-elographics xf86-input-evdev xf86-input-keyboard -xf86-input-libinput +>systemd xf86-input-libinput xf86-input-mouse xf86-input-void -xorg-server xorg-server-utils xorg-twm xorg-utils @@ -132,6 +132,23 @@ yelp >extra unace >extra lrzip >extra gtk3-print-backends +>openrc alsa-utils-openrc +>openrc avahi-openrc +>openrc elogind-openrc +>openrc cronjobs +>openrc displaymanager-openrc +>openrc networkmanager-openrc +>openrc ntp-openrc +>openrc openssh-openrc +>openrc sddm-elogind +>openrc syslog-ng-openrc +>openrc json-c +>openrc xdg-user-dirs-nosystemd +>openrc xorg-server-nosystemd +>openrc xf86-input-libinput-nosystemd +>openrc accountsservice-elogind +>openrc upower-nosystemd +>openrc udisks2-elogind >extra libreoffice-fresh >extra thunderbird >extra lollypop @@ -161,4 +178,3 @@ yelp >extra patch >extra subversion >extra yaourt - diff --git a/community/budgie/profile.conf b/community/budgie/profile.conf index 0c22880..02f5ac1 100644 --- a/community/budgie/profile.conf +++ b/community/budgie/profile.conf @@ -41,7 +41,7 @@ displaymanager="lightdm" # unset defaults to given values, # names must match openrc service names -# enable_openrc=('acpid' 'bluetooth' 'consolekit' 'cronie' 'cupsd' 'dbus' 'syslog-ng' 'NetworkManager') +# enable_openrc=('acpid' 'bluetooth' 'elogind' 'cronie' 'cupsd' 'dbus' 'syslog-ng' 'NetworkManager') # disable_openrc=() # unset defaults to given values diff --git a/community/cinnamon/Packages-Desktop b/community/cinnamon/Packages-Desktop index 66eb395..ac13dff 100644 --- a/community/cinnamon/Packages-Desktop +++ b/community/cinnamon/Packages-Desktop @@ -107,17 +107,16 @@ ttf-liberation vi >extra xcursor-chameleon-pearl-deepin xdg-su -xdg-user-dirs xdg-user-dirs-gtk xdg-utils xed xf86-input-elographics xf86-input-evdev xf86-input-keyboard -xf86-input-libinput +>systemd xf86-input-libinput +>openrc xf86-input-libinput-nosystemd xf86-input-mouse xf86-input-void -xorg-server xorg-server-utils xorg-twm xorg-utils @@ -126,3 +125,10 @@ xorg-xinit >extra xreader >extra xviewer-plugins >extra yaourt +>openrc accountsservice-elogind +>openrc upower-nosystemd +>openrc udisks2-elogind +>openrc xdg-user-dirs-nosystemd +>openrc xorg-server-nosystemd +>systemd xdg-user-dirs +>systemd xorg-server diff --git a/community/cinnamon/profile.conf b/community/cinnamon/profile.conf index 605cd48..b70d0a1 100644 --- a/community/cinnamon/profile.conf +++ b/community/cinnamon/profile.conf @@ -42,7 +42,7 @@ nonfree_mhwd="true" # unset defaults to given values, # names must match openrc service names -# enable_openrc=('acpid' 'bluetooth' 'consolekit' 'cronie' 'cupsd' 'dbus' 'syslog-ng' 'NetworkManager') +# enable_openrc=('acpid' 'bluetooth' 'elogind' 'cronie' 'cupsd' 'dbus' 'syslog-ng' 'NetworkManager') # disable_openrc=() # unset defaults to given values diff --git a/community/deepin/Packages-Desktop b/community/deepin/Packages-Desktop index 9b08ed2..a116573 100644 --- a/community/deepin/Packages-Desktop +++ b/community/deepin/Packages-Desktop @@ -104,16 +104,15 @@ ttf-indic-otf ttf-liberation xarchiver xdg-su -xdg-user-dirs xdg-utils xf86-input-elographics xf86-input-evdev xf86-input-keyboard -xf86-input-libinput +>systemd xf86-input-libinput +>openrc xf86-input-libinput-nosystemd xf86-input-mouse xf86-input-void xfburn -xorg-server xorg-server-utils xorg-twm xorg-utils @@ -121,3 +120,10 @@ xorg-xinit xsane xsane-gimp yaourt +>openrc accountsservice-elogind +>openrc upower-nosystemd +>openrc udisks2-elogind +>openrc xdg-user-dirs-nosystemd +>openrc xorg-server-nosystemd +>systemd xdg-user-dirs +>systemd xorg-server diff --git a/community/deepin/profile.conf b/community/deepin/profile.conf index f8ab901..c66819e 100644 --- a/community/deepin/profile.conf +++ b/community/deepin/profile.conf @@ -42,7 +42,7 @@ displaymanager="lightdm" # unset defaults to given values, # names must match openrc service names -# enable_openrc=('acpid' 'bluetooth' 'consolekit' 'cronie' 'cupsd' 'dbus' 'syslog-ng' 'NetworkManager') +# enable_openrc=('acpid' 'bluetooth' 'elogind' 'cronie' 'cupsd' 'dbus' 'syslog-ng' 'NetworkManager') # disable_openrc=() # unset defaults to given values diff --git a/community/i3/Packages-Desktop b/community/i3/Packages-Desktop index cdeed69..80452b7 100644 --- a/community/i3/Packages-Desktop +++ b/community/i3/Packages-Desktop @@ -12,9 +12,8 @@ binutils bison blueman bmenu ->openrc cgmanager-openrc clipit ->openrc consolekit-openrc +>openrc elogind-openrc dfc >openrc displaymanager-openrc dmidecode @@ -79,10 +78,9 @@ mousepad >multilib lib32-flex >multilib lib32-mesa-demos ncdu -netctl ->systemd networkmanager +>systemd netctl +networkmanager >openrc networkmanager-openrc ->openrc networkmanager-consolekit network-manager-applet networkmanager-dispatcher-ntpd networkmanager-openconnect @@ -103,7 +101,6 @@ patch pcmanfm perl-file-mimeinfo pkg-config ->openrc pm-utils polkit-gnome poppler-data powertop @@ -137,18 +134,17 @@ xautolock xcursor-chameleon-pearl xcursor-maia xdg-su -xdg-user-dirs xdg-utils xdotool xf86-input-elographics xf86-input-evdev xf86-input-keyboard -xf86-input-libinput +>systemd xf86-input-libinput +>openrc xf86-input-libinput-nosystemd xf86-input-mouse xf86-input-void xfburn xfce4-power-manager -xorg-server xorg-server-utils xorg-twm xorg-utils @@ -157,3 +153,10 @@ xorg-xkill xorg-xprop xterm yaourt +>openrc accountsservice-elogind +>openrc upower-nosystemd +>openrc udisks2-elogind +>openrc xdg-user-dirs-nosystemd +>openrc xorg-server-nosystemd +>systemd xdg-user-dirs +>systemd xorg-server diff --git a/community/i3/profile.conf b/community/i3/profile.conf index 122676e..3cc3ad8 100644 --- a/community/i3/profile.conf +++ b/community/i3/profile.conf @@ -42,7 +42,7 @@ displaymanager="lightdm" # unset defaults to given values, # names must match openrc service names -# enable_openrc=('acpid' 'bluetooth' 'consolekit' 'cronie' 'cupsd' 'dbus' 'syslog-ng' 'NetworkManager') +# enable_openrc=('acpid' 'bluetooth' 'elogind' 'cronie' 'cupsd' 'dbus' 'syslog-ng' 'NetworkManager') # disable_openrc=() # unset defaults to given values diff --git a/community/mate/Packages-Desktop b/community/mate/Packages-Desktop index 8bcd32c..5e58380 100644 --- a/community/mate/Packages-Desktop +++ b/community/mate/Packages-Desktop @@ -72,15 +72,12 @@ nss-mdns numlockx >openrc alsa-utils-openrc >openrc avahi-openrc ->openrc cgmanager-openrc ->openrc consolekit-openrc +>openrc elogind-openrc >openrc displaymanager-openrc ->openrc networkmanager-consolekit >openrc networkmanager-openrc >openrc ntp-openrc >openrc openssh-openrc ->openrc pm-utils ->openrc sddm-consolekit +>openrc sddm-elogind >openrc syslog-ng-openrc openresolv pamac @@ -90,7 +87,7 @@ pulseaudio-ctl pulseaudio-zeroconf >systemd alsa-utils >systemd avahi ->systemd networkmanager +networkmanager >systemd ntp >systemd openssh terminus-font @@ -107,16 +104,15 @@ firefox-arc-maia-settings manjaro-mate-panel-layout vino xdg-su -xdg-user-dirs xdg-user-dirs-gtk xdg-utils xf86-input-elographics xf86-input-evdev xf86-input-keyboard -xf86-input-libinput +>systemd xf86-input-libinput +>openrc xf86-input-libinput-nosystemd xf86-input-mouse xf86-input-void -xorg-server xorg-server-utils xorg-twm xorg-utils @@ -155,3 +151,10 @@ yelp >extra subversion >extra yaourt +>openrc accountsservice-elogind +>openrc upower-nosystemd +>openrc udisks2-elogind +>openrc xdg-user-dirs-nosystemd +>openrc xorg-server-nosystemd +>systemd xdg-user-dirs +>systemd xorg-server diff --git a/community/mate/profile.conf b/community/mate/profile.conf index 87d06b9..4743d12 100644 --- a/community/mate/profile.conf +++ b/community/mate/profile.conf @@ -42,7 +42,7 @@ netinstall="true" # unset defaults to given values, # names must match openrc service names -# enable_openrc=('acpid' 'bluetooth' 'consolekit' 'cronie' 'cupsd' 'dbus' 'syslog-ng' 'NetworkManager') +# enable_openrc=('acpid' 'bluetooth' 'elogind' 'cronie' 'cupsd' 'dbus' 'syslog-ng' 'NetworkManager') # disable_openrc=() # unset defaults to given values diff --git a/manjaro/gnome/profile.conf b/manjaro/gnome/profile.conf index 8aa8409..239d3b3 100644 --- a/manjaro/gnome/profile.conf +++ b/manjaro/gnome/profile.conf @@ -42,7 +42,7 @@ displaymanager="gdm" # unset defaults to given values, # names must match openrc service names -# enable_openrc=('acpid' 'bluetooth' 'consolekit' 'cronie' 'cupsd' 'dbus' 'syslog-ng' 'NetworkManager') +# enable_openrc=('acpid' 'bluetooth' 'elogind' 'cronie' 'cupsd' 'dbus' 'syslog-ng' 'NetworkManager') # disable_openrc=() # unset defaults to given values diff --git a/manjaro/kde/Packages-Desktop b/manjaro/kde/Packages-Desktop index 6102742..55dd057 100644 --- a/manjaro/kde/Packages-Desktop +++ b/manjaro/kde/Packages-Desktop @@ -1,9 +1,8 @@ ## Network >systemd avahi >openrc avahi-openrc ->systemd networkmanager +networkmanager >openrc networkmanager-openrc ->openrc networkmanager-consolekit networkmanager-openconnect networkmanager-openvpn networkmanager-pptp @@ -126,7 +125,7 @@ octopi-repoeditor ## Display manager >systemd sddm ->openrc sddm-consolekit +>openrc sddm-elogind sddm-kcm ## Plasma5 @@ -291,12 +290,16 @@ manjaro-browser-settings xf86-input-elographics xf86-input-evdev xf86-input-keyboard -xf86-input-libinput +>systemd xf86-input-libinput +>openrc xf86-input-libinput-nosystemd xf86-input-mouse xf86-input-void ## Xorg Server and Graphics -xorg-server +>systemd xdg-user-dirs +>systemd xorg-server +>openrc xdg-user-dirs-nosystemd +>openrc xorg-server-nosystemd xorg-server-utils xorg-twm xorg-utils @@ -306,13 +309,13 @@ mesa-demos ## Desktop Utils perl-file-mimeinfo -xdg-user-dirs xdg-utils xdg-su ## Misc ->openrc consolekit-openrc ->openrc displaymanager-openrc ->openrc pm-utils ->openrc cgmanager-openrc manjaro-hotfixes +>openrc elogind-openrc +>openrc displaymanager-openrc +>openrc accountsservice-elogind +>openrc upower-nosystemd +>openrc udisks2-elogind diff --git a/manjaro/kde/profile.conf b/manjaro/kde/profile.conf index 5668cbb..71d238d 100644 --- a/manjaro/kde/profile.conf +++ b/manjaro/kde/profile.conf @@ -41,7 +41,7 @@ disable_systemd=('pacman-init') # unset defaults to given values, # names must match openrc service names -# enable_openrc=('acpid' 'bluetooth' 'cgmanager' 'consolekit' 'cronie' 'cupsd' 'dbus' 'syslog-ng' 'NetworkManager') +# enable_openrc=('acpid' 'bluetooth' 'elogind' 'cronie' 'cupsd' 'dbus' 'syslog-ng' 'NetworkManager') # disable_openrc=() # the same workgroup name if samba is used diff --git a/manjaro/lxqt/Packages-Desktop b/manjaro/lxqt/Packages-Desktop index 160c9f9..a07cd96 100644 --- a/manjaro/lxqt/Packages-Desktop +++ b/manjaro/lxqt/Packages-Desktop @@ -35,18 +35,20 @@ obconf-qt openbox >openrc alsa-utils-openrc >openrc avahi-openrc ->openrc cgmanager-openrc ->openrc consolekit-openrc +>openrc elogind-openrc >openrc cronjobs >openrc displaymanager-openrc ->openrc networkmanager-consolekit >openrc networkmanager-openrc >openrc ntp-openrc >openrc openssh-openrc ->openrc pm-utils ->openrc sddm-consolekit +>openrc sddm-elogind >openrc syslog-ng-openrc >openrc json-c +>openrc xdg-user-dirs-nosystemd +>openrc xorg-server-nosystemd +>openrc accountsservice-elogind +>openrc upower-nosystemd +>openrc udisks2-elogind pcmanfm-qt powertop qterminal @@ -57,11 +59,13 @@ qupzilla sddm-qt-manjaro-theme >systemd alsa-utils >systemd avahi ->systemd networkmanager +networkmanager >systemd ntp >systemd openssh >systemd sddm >systemd syslog-ng +>systemd xdg-user-dirs +>systemd xorg-server terminus-font ttf-bitstream-vera ttf-dejavu @@ -71,9 +75,7 @@ ttf-indic-otf ttf-liberation xarchiver xdg-su -xdg-user-dirs xdg-utils -xorg-server xorg-server-utils xorg-twm xorg-utils diff --git a/manjaro/lxqt/Packages-Live b/manjaro/lxqt/Packages-Live index 502aa61..e488c1a 100644 --- a/manjaro/lxqt/Packages-Live +++ b/manjaro/lxqt/Packages-Live @@ -26,7 +26,8 @@ virtualbox-guest-utils xf86-input-elographics xf86-input-evdev xf86-input-keyboard -xf86-input-libinput +>systemd xf86-input-libinput +>openrc xf86-input-libinput-nosystemd xf86-input-mouse xf86-input-vmmouse xf86-input-void diff --git a/manjaro/lxqt/profile.conf b/manjaro/lxqt/profile.conf index be8bfc0..aeb58ba 100644 --- a/manjaro/lxqt/profile.conf +++ b/manjaro/lxqt/profile.conf @@ -51,7 +51,7 @@ enable_systemd=('bluetooth' 'cronie' 'ModemManager' 'NetworkManager' 'tlp' 'tlp- # unset defaults to given values, # names must match openrc service names -enable_openrc=('acpid' 'cgmanager' 'consolekit' 'cronie' 'dbus' 'syslog-ng' 'NetworkManager') +enable_openrc=('acpid' 'elogind' 'cronie' 'dbus' 'syslog-ng' 'NetworkManager') # disable_openrc=() diff --git a/manjaro/netinstall/Packages-Live b/manjaro/netinstall/Packages-Live index 2208593..b2a46b1 100644 --- a/manjaro/netinstall/Packages-Live +++ b/manjaro/netinstall/Packages-Live @@ -11,21 +11,18 @@ manjaro-live-skel mkinitcpio-nfs-utils nbd network-manager-applet ->openrc cgmanager-openrc ->openrc consolekit-openrc +>openrc elogind-openrc >openrc displaymanager-openrc >openrc manjaro-live-openrc ->openrc networkmanager-consolekit >openrc networkmanager-openrc ->openrc pm-utils ->openrc sddm-consolekit +>openrc sddm-elogind open-vm-tools qt5ct sddm-andromeda-qt-theme >sonar sonar-calamares-branding >sonar sonar-syslinux-theme >systemd manjaro-live-systemd ->systemd networkmanager +networkmanager >systemd sddm >x86_64 manjaro-efi-utils virtualbox-guest-utils @@ -33,7 +30,8 @@ xcursor-breeze xf86-input-elographics xf86-input-evdev xf86-input-keyboard -xf86-input-libinput +>systemd xf86-input-libinput +>openrc xf86-input-libinput-nosystemd xf86-input-mouse xf86-input-vmmouse xf86-input-void diff --git a/manjaro/netinstall/profile.conf b/manjaro/netinstall/profile.conf index 9d231c8..b4b56f3 100644 --- a/manjaro/netinstall/profile.conf +++ b/manjaro/netinstall/profile.conf @@ -51,7 +51,7 @@ enable_systemd=('bluetooth' 'cronie' 'ModemManager' 'NetworkManager' 'tlp' 'tlp- # unset defaults to given values, # names must match openrc service names -enable_openrc=('acpid' 'cgmanager' 'consolekit' 'cronie' 'dbus' 'syslog-ng' 'NetworkManager') +enable_openrc=('acpid' 'elogind' 'cronie' 'dbus' 'syslog-ng' 'NetworkManager') # disable_openrc=() diff --git a/manjaro/xfce/Packages-Desktop b/manjaro/xfce/Packages-Desktop index 831e8e3..7f013a0 100644 --- a/manjaro/xfce/Packages-Desktop +++ b/manjaro/xfce/Packages-Desktop @@ -1,9 +1,8 @@ ## Network >systemd avahi >openrc avahi-openrc ->systemd networkmanager +networkmanager >openrc networkmanager-openrc ->openrc networkmanager-consolekit networkmanager-openconnect networkmanager-openvpn networkmanager-pptp @@ -244,15 +243,19 @@ manjaro-browser-settings xf86-input-elographics xf86-input-evdev xf86-input-keyboard -xf86-input-libinput +>systemd xf86-input-libinput +>openrc xf86-input-libinput-nosystemd xf86-input-mouse xf86-input-void ## Xorg Server and Graphics +>systemd xdg-user-dirs +>systemd xorg-server +>openrc xdg-user-dirs-nosystemd +>openrc xorg-server-nosystemd numlockx mesa-demos >multilib lib32-mesa-demos -xorg-server xorg-server-utils xorg-twm xorg-utils @@ -261,13 +264,14 @@ xorg-xkill ## Desktop Utils perl-file-mimeinfo -xdg-user-dirs xdg-utils xdg-su ## Misc ->openrc consolekit-openrc ->openrc displaymanager-openrc ->openrc pm-utils ->openrc cgmanager-openrc manjaro-hotfixes +>openrc elogind-openrc +>openrc displaymanager-openrc +>openrc accountsservice-elogind +>openrc upower-nosystemd +>openrc udisks2-elogind + diff --git a/manjaro/xfce/profile.conf b/manjaro/xfce/profile.conf index 99c6616..9dd92ce 100644 --- a/manjaro/xfce/profile.conf +++ b/manjaro/xfce/profile.conf @@ -40,7 +40,7 @@ disable_systemd=('pacman-init') # unset defaults to given values, # names must match openrc service names -# enable_openrc=('acpid' 'bluetooth' 'cgmanager' 'consolekit' 'cronie' 'cupsd' 'dbus' 'syslog-ng' 'NetworkManager') +# enable_openrc=('acpid' 'bluetooth' 'elogind' 'cronie' 'cupsd' 'dbus' 'syslog-ng' 'NetworkManager') # disable_openrc=() # the same workgroup name if samba is used diff --git a/shared/Packages-Desktop b/shared/Packages-Desktop index c6c2ed7..6b6ee47 100644 --- a/shared/Packages-Desktop +++ b/shared/Packages-Desktop @@ -14,20 +14,24 @@ nss-mdns numlockx >openrc alsa-utils-openrc >openrc avahi-openrc ->openrc cgmanager-openrc ->openrc consolekit-openrc +>openrc elogind-openrc >openrc displaymanager-openrc ->openrc networkmanager-consolekit >openrc networkmanager-openrc >openrc ntp-openrc >openrc openssh-openrc ->openrc pm-utils +>openrc accountsservice-elogind +>openrc upower-nosystemd +>openrc udisks2-elogind +>openrc xdg-user-dirs-nosystemd +>openrc xorg-server-nosystemd powertop >systemd alsa-utils >systemd avahi ->systemd networkmanager +networkmanager >systemd ntp >systemd openssh +>systemd xdg-user-dirs +>systemd xorg-server terminus-font ttf-bitstream-vera ttf-dejavu @@ -36,15 +40,14 @@ ttf-inconsolata ttf-indic-otf ttf-liberation xdg-su -xdg-user-dirs xdg-utils xf86-input-elographics xf86-input-evdev xf86-input-keyboard -xf86-input-libinput +>systemd xf86-input-libinput +>openrc xf86-input-libinput-nosystemd xf86-input-mouse xf86-input-void -xorg-server xorg-server-utils xorg-twm xorg-utils diff --git a/shared/Packages-Root b/shared/Packages-Root index 2ae6586..160548b 100644 --- a/shared/Packages-Root +++ b/shared/Packages-Root @@ -56,6 +56,7 @@ ntfs-3g >openrc cronie-openrc >openrc cryptsetup-openrc >openrc dbus-openrc +>openrc dbus-elogind >openrc device-mapper-openrc >openrc dhcpcd-openrc >openrc eudev-systemd @@ -67,12 +68,14 @@ ntfs-3g >openrc nfs-utils-openrc >openrc rsync-openrc >openrc wpa_supplicant-openrc +>openrc libusb-nosystemd os-prober pacman pciutils pcmciautils perl -procps-ng +>systemd procps-ng +>openrc procps-ng-elogind psmisc reiserfsprogs sed @@ -98,7 +101,8 @@ sysfsutils tar texinfo usbutils -util-linux +>systemd util-linux +>openrc util-linux-nosystemd which xfsprogs zd1211-firmware diff --git a/shared/profile.conf.example b/shared/profile.conf.example index 9b7e5fc..ce9332e 100644 --- a/shared/profile.conf.example +++ b/shared/profile.conf.example @@ -42,7 +42,7 @@ # unset defaults to given values, # names must match openrc service names -# enable_openrc=('acpid' 'bluetooth' 'cgmanager' 'consolekit' 'cronie' 'cupsd' 'dbus' 'syslog-ng' 'NetworkManager') +# enable_openrc=('acpid' 'bluetooth' 'elogind' 'cronie' 'cupsd' 'dbus' 'syslog-ng' 'NetworkManager') # disable_openrc=() # unset defaults to given values diff --git a/sonar/gnome-edition/profile.conf b/sonar/gnome-edition/profile.conf index 68428fc..5bcb20d 100644 --- a/sonar/gnome-edition/profile.conf +++ b/sonar/gnome-edition/profile.conf @@ -42,7 +42,7 @@ enable_systemd=('bluetooth' 'ModemManager' 'NetworkManager' 'org.cups.cupsd' 'tl # unset defaults to given values, # names must match openrc service names -# enable_openrc=('acpid' 'bluetooth' 'consolekit' 'cronie' 'cupsd' 'dbus' 'syslog-ng' 'NetworkManager') +# enable_openrc=('acpid' 'bluetooth' 'elogind' 'cronie' 'cupsd' 'dbus' 'syslog-ng' 'NetworkManager') # disable_openrc=() # unset defaults to given values diff --git a/sonar/mate-edition/Packages-Desktop b/sonar/mate-edition/Packages-Desktop index 5de6a50..e0d3095 100644 --- a/sonar/mate-edition/Packages-Desktop +++ b/sonar/mate-edition/Packages-Desktop @@ -23,12 +23,12 @@ xf86-input-elographics xf86-input-evdev xf86-input-keyboard xf86-input-mouse -xf86-input-libinput +>systemd xf86-input-libinput +>openrc xf86-input-libinput-nosystemd xf86-input-synaptics #synaptic mice xf86-input-void ## Xorg Server and Graphics -xorg-server xorg-server-utils xorg-twm xorg-utils @@ -37,7 +37,6 @@ mesa-demos >multilib lib32-mesa-demos ## Desktop Utils -xdg-user-dirs xdg-utils xdg-su numlockx @@ -65,8 +64,7 @@ alsa-firmware ## Network mobile-broadband-provider-info modemmanager ->systemd networkmanager ->openrc networkmanager-consolekit +networkmanager >openrc networkmanager-openrc >openrc avahi-openrc >systemd avahi @@ -77,11 +75,16 @@ nss-mdns >openrc openssh-openrc ## Misc ->openrc consolekit-openrc +>openrc elogind-openrc >openrc displaymanager-openrc ->openrc pm-utils ->openrc cgmanager-openrc manjaro-hotfixes +>openrc accountsservice-elogind +>openrc upower-nosystemd +>openrc udisks2-elogind +>openrc xdg-user-dirs-nosystemd +>openrc xorg-server-nosystemd +>systemd xdg-user-dirs +>systemd xorg-server #accessibility packages >systemd espeakup diff --git a/sonar/mate-edition/profile.conf b/sonar/mate-edition/profile.conf index 2cad5ac..c076bdd 100644 --- a/sonar/mate-edition/profile.conf +++ b/sonar/mate-edition/profile.conf @@ -50,7 +50,7 @@ enable_systemd=('bluetooth' 'cronie' 'ModemManager' 'NetworkManager' 'tlp' 'tlp- # unset defaults to given values, # names must match openrc service names -enable_openrc=('acpid' 'cgmanager' 'consolekit' 'cronie' 'dbus' 'syslog-ng' 'NetworkManager' 'brltty') +enable_openrc=('acpid' 'elogind' 'cronie' 'dbus' 'syslog-ng' 'NetworkManager' 'brltty') # disable_openrc=()