From b6f68762c041603017c996b894509c937c048057 Mon Sep 17 00:00:00 2001 From: "Ivan A. Melnikov" Date: Wed, 3 Feb 2021 16:01:30 +0400 Subject: [PATCH] slinux: Add use/ntp/chrony mixin-base In addition to code re-use, it also pins chrony as ntp daemon implementation, which helps to avoid adding systemd-timesyncd into the images. --- features.in/slinux/config.mk | 3 +-- pkg.in/lists/slinux/misc-base | 1 - 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/features.in/slinux/config.mk b/features.in/slinux/config.mk index bc0e11b2..e51fac76 100644 --- a/features.in/slinux/config.mk +++ b/features.in/slinux/config.mk @@ -15,7 +15,6 @@ use/slinux/services-enabled: @$(call add,SYSTEMD_SERVICES_ENABLE,anacron.service) @$(call add,SYSTEMD_SERVICES_ENABLE,avahi-daemon.service) @$(call add,SYSTEMD_SERVICES_ENABLE,bluetooth.service) - @$(call add,SYSTEMD_SERVICES_ENABLE,chronyd.service) @$(call add,SYSTEMD_SERVICES_ENABLE,cpufreq-simple.service) @$(call add,SYSTEMD_SERVICES_ENABLE,crond.service) @$(call add,SYSTEMD_SERVICES_ENABLE,cups.service) @@ -65,6 +64,7 @@ use/slinux/vm-base:: vm/systemd \ use/slinux/mixin-base: use/slinux use/x11/xorg use/x11/lightdm/gtk +pulse \ +nm use/x11/gtk/nm +systemd +systemd-optimal +wireless \ use/l10n/default/ru_RU \ + use/ntp/chrony \ use/office/LibreOffice/full \ use/docs/manual use/docs/indexhtml \ use/xdg-user-dirs/deep use/slinux/services @@ -104,7 +104,6 @@ use/slinux/base: use/isohybrid use/luks \ @$(call add,LIVE_LISTS,slinux/live) @$(call add,BASE_PACKAGES,installer-distro-simply-linux-stage3) @$(call add,STAGE2_PACKAGES,xorg-conf-libinput-touchpad) - @$(call add,STAGE2_PACKAGES,chrony) use/slinux/full: use/slinux/base @$(call add,MAIN_LISTS,slinux/not-install-full) diff --git a/pkg.in/lists/slinux/misc-base b/pkg.in/lists/slinux/misc-base index e1579305..a1ed663f 100644 --- a/pkg.in/lists/slinux/misc-base +++ b/pkg.in/lists/slinux/misc-base @@ -9,7 +9,6 @@ anacron os-prober make-initrd-lvm shadow-change -chrony dhcpcd telnet