From dc1170b578793ae2a01d5d07e1f3d4f33d10d125 Mon Sep 17 00:00:00 2001 From: Anton Midyukov Date: Sun, 18 Feb 2018 18:13:19 +0700 Subject: [PATCH] init, regular.mk: use/init/sysv/consolekit This target is only needed for systems based on sysV init to replace logind; it conflicts with systemd-logind. --- conf.d/regular.mk | 4 ++-- features.in/init/config.mk | 3 +++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/conf.d/regular.mk b/conf.d/regular.mk index 933c3850..88de01a5 100644 --- a/conf.d/regular.mk +++ b/conf.d/regular.mk @@ -37,10 +37,10 @@ distro/.regular-desktop: distro/.regular-wm \ @$(call set,KFLAVOURS,std-def) distro/.regular-gtk: distro/.regular-desktop use/x11/lightdm/gtk +plymouth; @: +distro/.regular-sysv: distro/.regular-wm +sysvinit \ + use/init/sysv/consolekit; @: distro/.regular-sysv-gtk: distro/.regular-sysv use/syslinux/ui/gfxboot \ use/x11/gdm2.20; @: -distro/.regular-sysv: distro/.regular-wm +sysvinit - @$(call add,THE_PACKAGES,ConsoleKit ConsoleKit-x11 pam-ck-connector) distro/.regular-install: distro/.regular-base +installer +sysvinit +power \ use/branding use/bootloader/grub use/luks \ diff --git a/features.in/init/config.mk b/features.in/init/config.mk index 6f876c1c..d16e4915 100644 --- a/features.in/init/config.mk +++ b/features.in/init/config.mk @@ -14,6 +14,9 @@ use/init/sysv: use/init use/init/sysv/polkit: use/init/sysv @$(call add,THE_PACKAGES,polkit-sysvinit) +use/init/sysv/consolekit: use/init/sysv + @$(call add,THE_PACKAGES,ConsoleKit ConsoleKit-x11 pam-ck-connector) + ### i-f should be dropped as soon as rootfs scripts are effective there use/init/systemd: use/init @$(call set,INIT_TYPE,systemd)