Commit 9b4862b3 authored by Mikhail Efremov's avatar Mikhail Efremov Committed by Anton Midyukov

workstation: Use alterator-web for all arches

Alterator-web should be enabled for all arches, not e2k only. See https://bugzilla.altlinux.org/45188.
parent 950a08ae
...@@ -46,8 +46,6 @@ ifeq (,$(filter-out e2k%,$(ARCH))) ...@@ -46,8 +46,6 @@ ifeq (,$(filter-out e2k%,$(ARCH)))
@$(call add,THE_PACKAGES,xorg-drv-smi) # use/x11/smi @$(call add,THE_PACKAGES,xorg-drv-smi) # use/x11/smi
@$(call add,THE_PACKAGES,flashrom) @$(call add,THE_PACKAGES,flashrom)
@$(call add,MAIN_PACKAGES,alterator-secsetup) @$(call add,MAIN_PACKAGES,alterator-secsetup)
@$(call add,MAIN_GROUPS,workstation/alterator-web)
@$(call add,SERVICES_ENABLE,ahttpd) # in case it gets installed
ifeq (,$(filter-out e2k,$(ARCH))) ifeq (,$(filter-out e2k,$(ARCH)))
@$(call set,META_VOL_ID,ALT Workstation for Elbrus 401-PC) @$(call set,META_VOL_ID,ALT Workstation for Elbrus 401-PC)
endif # e2k endif # e2k
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
mixin/alt-workstation-install: workstation_groups = $(addprefix workstation/,\ mixin/alt-workstation-install: workstation_groups = $(addprefix workstation/,\
10-office 20-networking 30-multimedia 40-virtualization \ 10-office 20-networking 30-multimedia 40-virtualization \
raccess agents emulators ganttproject gnome-peer-to-peer graphics-editing \ raccess agents alterator-web emulators ganttproject gnome-peer-to-peer graphics-editing \
libreoffice mate-usershare pidgin scanning scribus \ libreoffice mate-usershare pidgin scanning scribus \
sound-editing thunderbird freeipa-client gpolicy) sound-editing thunderbird freeipa-client gpolicy)
...@@ -61,6 +61,7 @@ endif ...@@ -61,6 +61,7 @@ endif
@$(call add,SERVICES_ENABLE,cups cups-browsed smb nmb httpd2 bluetoothd libvirtd) @$(call add,SERVICES_ENABLE,cups cups-browsed smb nmb httpd2 bluetoothd libvirtd)
@$(call add,SERVICES_ENABLE,crond) @$(call add,SERVICES_ENABLE,crond)
@$(call add,SERVICES_ENABLE,fstrim.timer) @$(call add,SERVICES_ENABLE,fstrim.timer)
@$(call add,SERVICES_ENABLE,ahttpd) # in case it gets installed
@$(call add,SERVICES_DISABLE,powertop bridge gpm) @$(call add,SERVICES_DISABLE,powertop bridge gpm)
@$(call add,SYSTEMD_SERVICES_DISABLE,systemd-userdbd.service) @$(call add,SYSTEMD_SERVICES_DISABLE,systemd-userdbd.service)
@$(call add,SYSTEMD_SERVICES_DISABLE,systemd-userdbd.socket) @$(call add,SYSTEMD_SERVICES_DISABLE,systemd-userdbd.socket)
......
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