Skip to content

M
mkimage-profiles
Commit b6f68762 authored by Ivan A. Melnikov's avatar Ivan A. Melnikov Committed by Anton Midyukov
Browse files
Options

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.
parent 8e9fa2bd
Show whitespace changes
Inline Side-by-side
Showing with 1 addition and 3 deletions
features.in/slinux/config.mk
View file @ b6f68762
...@@ -15,7 +15,6 @@ use/slinux/services-enabled: ...@@ -15,7 +15,6 @@ use/slinux/services-enabled:
@$(call add,SYSTEMD_SERVICES_ENABLE,anacron.service) @$(call add,SYSTEMD_SERVICES_ENABLE,anacron.service)
@$(call add,SYSTEMD_SERVICES_ENABLE,avahi-daemon.service) @$(call add,SYSTEMD_SERVICES_ENABLE,avahi-daemon.service)
@$(call add,SYSTEMD_SERVICES_ENABLE,bluetooth.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,cpufreq-simple.service)
@$(call add,SYSTEMD_SERVICES_ENABLE,crond.service) @$(call add,SYSTEMD_SERVICES_ENABLE,crond.service)
@$(call add,SYSTEMD_SERVICES_ENABLE,cups.service) @$(call add,SYSTEMD_SERVICES_ENABLE,cups.service)
...@@ -65,6 +64,7 @@ use/slinux/vm-base:: vm/systemd \ ...@@ -65,6 +64,7 @@ use/slinux/vm-base:: vm/systemd \
use/slinux/mixin-base: use/slinux use/x11/xorg use/x11/lightdm/gtk +pulse \ use/slinux/mixin-base: use/slinux use/x11/xorg use/x11/lightdm/gtk +pulse \
+nm use/x11/gtk/nm +systemd +systemd-optimal +wireless \ +nm use/x11/gtk/nm +systemd +systemd-optimal +wireless \
use/l10n/default/ru_RU \ use/l10n/default/ru_RU \
use/ntp/chrony \
use/office/LibreOffice/full \ use/office/LibreOffice/full \
use/docs/manual use/docs/indexhtml \ use/docs/manual use/docs/indexhtml \
use/xdg-user-dirs/deep use/slinux/services use/xdg-user-dirs/deep use/slinux/services
...@@ -104,7 +104,6 @@ use/slinux/base: use/isohybrid use/luks \ ...@@ -104,7 +104,6 @@ use/slinux/base: use/isohybrid use/luks \
@$(call add,LIVE_LISTS,slinux/live) @$(call add,LIVE_LISTS,slinux/live)
@$(call add,BASE_PACKAGES,installer-distro-simply-linux-stage3) @$(call add,BASE_PACKAGES,installer-distro-simply-linux-stage3)
@$(call add,STAGE2_PACKAGES,xorg-conf-libinput-touchpad) @$(call add,STAGE2_PACKAGES,xorg-conf-libinput-touchpad)
@$(call add,STAGE2_PACKAGES,chrony)
use/slinux/full: use/slinux/base use/slinux/full: use/slinux/base
@$(call add,MAIN_LISTS,slinux/not-install-full) @$(call add,MAIN_LISTS,slinux/not-install-full)
......
pkg.in/lists/slinux/misc-base
View file @ b6f68762
...@@ -9,7 +9,6 @@ anacron ...@@ -9,7 +9,6 @@ anacron
os-prober os-prober
make-initrd-lvm make-initrd-lvm
shadow-change shadow-change
chrony
dhcpcd dhcpcd
telnet telnet
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment