From 17464870125267e5ef735411251379f74e43e754 Mon Sep 17 00:00:00 2001 From: Anton Midyukov Date: Sun, 11 Feb 2024 19:02:11 +0700 Subject: [PATCH] regular.mk, regular-vm.mk: use/services/bluetooth-enable --- conf.d/regular-vm.mk | 4 ++-- conf.d/regular.mk | 3 +-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/conf.d/regular-vm.mk b/conf.d/regular-vm.mk index 3302a02a..ebfd7152 100644 --- a/conf.d/regular-vm.mk +++ b/conf.d/regular-vm.mk @@ -31,10 +31,10 @@ mixin/regular-vm-x11:: mixin/regular-vm-base mixin/regular-x11 \ mixin/regular-desktop use/oem/vnc; @: vm/.regular-desktop: vm/systemd mixin/regular-vm-x11 \ - +systemd +systemd-optimal +plymouth + +systemd +systemd-optimal +plymouth \ + use/services/bluetooth-enable @$(call add,THE_PACKAGES,bluez) @$(call add,THE_PACKAGES,glmark2 glmark2-es2) - @$(call add,DEFAULT_SERVICES_ENABLE,bluetoothd) @$(call try,VM_SIZE,8589934592) vm/.regular-desktop-sysv: vm/bare mixin/regular-vm-x11 use/x11/gdm2.20 \ diff --git a/conf.d/regular.mk b/conf.d/regular.mk index 24002041..3d4ca6a6 100644 --- a/conf.d/regular.mk +++ b/conf.d/regular.mk @@ -69,9 +69,8 @@ endif # TODO: use/plymouth/live when luks+plymouth is done, see also #28255 distro/.regular-desktop: distro/.regular-wm use/branding/full \ use/firmware/laptop +systemd +systemd-optimal +vmguest \ - use/live-install/oem + use/live-install/oem use/services/bluetooth-enable @$(call add,THE_PACKAGES,bluez) - @$(call add,DEFAULT_SERVICES_ENABLE,bluetoothd) distro/.regular-gtk: distro/.regular-desktop use/x11/lightdm/gtk +plymouth; @: