From fbc102f2d5b1a8bba8c03fbe6fa1a38e57a2f0a7 Mon Sep 17 00:00:00 2001 From: Anton Midyukov Date: Mon, 8 Apr 2019 18:37:14 +0700 Subject: [PATCH] mixin.mk, regular.mk: switch sysvinit builds to elogind elogind provides sessions for polkit; use/init/sysv/polkit and use/deflogin/sysv/nm are not needed anymore, polkit-agent is needed instead. --- conf.d/mixin.mk | 9 ++++----- conf.d/regular.mk | 8 ++++---- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/conf.d/mixin.mk b/conf.d/mixin.mk index 76f33b26..ea6473cf 100644 --- a/conf.d/mixin.mk +++ b/conf.d/mixin.mk @@ -66,12 +66,13 @@ mixin/regular-wmaker: use/efi/refind use/syslinux/ui/gfxboot \ @$(call add,LIVE_PACKAGES,livecd-install-wmaker) @$(call add,LIVE_PACKAGES,installer-feature-no-xconsole-stage3) @$(call add,MAIN_PACKAGES,wmgtemp wmhdaps wmpomme wmxkbru xxkb) + @$(call add,THE_PACKAGES,polkit-gnome) -mixin/regular-icewm: use/fonts/ttf/redhat use/deflogin/sysv/nm +icewm +nm +mixin/regular-icewm: use/fonts/ttf/redhat +icewm +nm @$(call add,THE_LISTS,$(call tags,regular icewm)) @$(call add,THE_LISTS,$(call tags,desktop nm)) @$(call add,THE_PACKAGES,icewm-startup-networkmanager) - @$(call add,THE_PACKAGES,mnt) + @$(call add,THE_PACKAGES,mnt polkit-gnome) # gdm2.20 can reboot/halt with both sysvinit and systemd, and is slim mixin/regular-gnustep: use/x11/gnustep use/x11/gdm2.20 use/mediacheck \ @@ -81,9 +82,7 @@ mixin/regular-gnustep: use/x11/gnustep use/x11/gdm2.20 use/mediacheck \ mixin/regular-xfce: use/x11/xfce use/x11/gtk/nm +nm \ use/fonts/ttf/redhat use/fonts/ttf/google/extra -mixin/regular-xfce-sysv: use/init/sysv/polkit use/deflogin/sysv/nm \ - use/x11/lightdm/gtk \ - use/browser/palemoon/i18n \ +mixin/regular-xfce-sysv: use/x11/lightdm/gtk use/browser/palemoon/i18n \ use/fonts/otf/adobe use/fonts/otf/mozilla @$(call add,THE_PACKAGES,pnmixer pm-utils elinks mpg123) @$(call add,THE_PACKAGES,alsa-oss ossp whdd wget cdrkit) diff --git a/conf.d/regular.mk b/conf.d/regular.mk index b0e416de..bb9b5abb 100644 --- a/conf.d/regular.mk +++ b/conf.d/regular.mk @@ -33,8 +33,8 @@ distro/.regular-desktop: distro/.regular-wm \ @$(call set,KFLAVOURS,std-def) distro/.regular-gtk: distro/.regular-desktop use/x11/lightdm/slick +plymouth; @: -distro/.regular-sysv: distro/.regular-wm +sysvinit \ - use/init/sysv/consolekit; @: +distro/.regular-sysv: distro/.regular-wm +elogind; @: + distro/.regular-sysv-gtk: distro/.regular-sysv use/syslinux/ui/gfxboot \ use/x11/gdm2.20; @: @@ -94,13 +94,13 @@ distro/.regular-install-x11-full: distro/.regular-install-x11 \ use/fonts/otf/adobe use/fonts/otf/mozilla use/fonts/chinese \ use/branding/complete use/branding/slideshow/once \ use/net-eth/dhcp use/efi/refind use/efi/shell use/rescue/base \ - use/init/sysv/consolekit + use/init/sysv/elogind @$(call add,RESCUE_LISTS,$(call tags,rescue misc)) @$(call add,MAIN_PACKAGES,anacron man-whatis usb-modeswitch) @$(call add,DEFAULT_SERVICES_ENABLE,alteratord) distro/regular-icewm: distro/.regular-sysv-gtk mixin/regular-icewm \ - use/init/sysv/polkit use/efi/refind use/browser/chromium + use/efi/refind use/browser/chromium @$(call set,KFLAVOURS,un-def) # wdm can't do autologin so add standalone one for livecd