Merge tag 'v1.5.13' into sisyphus

bin/tar2fs

@@ -344,7 +344,6 @@ fi
 tar -C "$ROOTFS" --numeric-owner -xf "$TAR"
 for i in /dev /proc /sys; do mount --bind "$i" "$ROOTFS$i"; done
 
-# loop device so lilo could work...
 if grep -qe "[[:space:]]/[[:space:]]" "$ROOTFS/etc/fstab"; then \
 	sed -i "s/LABEL=ROOT/$ROOTDEV/" "$ROOTFS/etc/fstab"
 else
@@ -397,38 +396,6 @@ ARCH="$(chroot "$ROOTFS" rpm --eval '%_host_cpu')"
 
 # Setup bootloader
 case "$BOOTLOADER" in
-lilo)
-	# configure and install bootloader
-	REGEXP='^.*: ([0-9]+) cylinders, ([0-9]+) heads, ([0-9]+) sectors/track*$'
-	set -- $(sfdisk -g "$LOOPDEV" | grep -E "$REGEXP" | sed -r "s@$REGEXP@\1 \2 \3@")
-
-	LILO_COMMON="lba32
-delay=1
-vga=0
-image=/boot/vmlinuz
-  initrd=/boot/initrd.img
-  append=\"root=$ROOTDEV rootdelay=3 console=tty1 console=ttyS0,115200n8\"
-  label=linux"
-
-	cat > "$ROOTFS"/etc/lilo-loop.conf <<-EOF
-	boot=$LOOPDEV
-	disk=$LOOPDEV
-	  bios=0x80
-	  cylinders=$1
-	  heads=$2
-	  sectors=$3
-	  partition=$LOOPROOT
-	  start=63
-	$LILO_COMMON
-	EOF
-
-	chroot "$ROOTFS" lilo -C /etc/lilo-loop.conf
-
-	cat > "$ROOTFS"/etc/lilo.conf <<-EOF
-	boot=$BLOCKDEV
-	$LILO_COMMON
-	EOF
-	;;
 grub-efi)
 	echo 'GRUB_DISABLE_OS_PROBER=true' >> "$ROOTFS"/etc/sysconfig/grub2
 	chroot "$ROOTFS" grub-mkconfig -o /boot/grub/grub.cfg

conf.d/education.mk

@@ -150,7 +150,9 @@ mixin/education-installer: \
 	@$(call add,MAIN_GROUPS,education/05_university)
 	@$(call add,MAIN_GROUPS,education/07_teacher)
 	@$(call add,MAIN_GROUPS,education/08_server-apps-edu)
+ifeq (,$(filter-out x86_64 aarch64,$(ARCH)))
 	@$(call add,MAIN_GROUPS,education/10_robotics)
+endif
 	@$(call add,BASE_PACKAGES,os-prober)
 	@$(call add,BASE_PACKAGES,guest-account)
 	@$(call add,MAIN_PACKAGES,iperf3)
@@ -185,7 +187,9 @@ ifeq (,$(filter-out e2k%,$(ARCH)))
 	@$(call add,CONTROL,pam_mktemp:disabled)	### private /tmp dirs
 else
 	@$(call add,MAIN_GROUPS,education/06_kde5)
+ifeq (,$(filter-out x86_64 aarch64,$(ARCH)))
 	@$(call add,MAIN_GROUPS,education/09_video-conferencing)
+endif
 endif	# e2k%
 ifeq (,$(filter-out i586 x86_64 aarch64,$(ARCH)))
 	@$(call set,KFLAVOURS,std-def un-def)

conf.d/mixin-alt-server.mk

@@ -21,13 +21,14 @@ mixin/alt-server: +installer +systemd \
 	use/volumes/alt-server \
 	use/apt-conf/branch \
 	use/fonts/install2 \
-	use/install2/stage3 \
+	use/l10n/default/ru_RU use/install2/stage3 \
 	use/firmware/full \
 	use/net/etcnet \
 	use/tty
 	@$(call set,INSTALLER,centaurus)
 	@$(call set,BRANDING,alt-server)
 	@$(call set,THE_APT_CONF,branch-gostcrypto)
+	@$(call set,DISABLE_LANG_MENU,in_grub)
 ifeq (,$(filter-out i586 x86_64,$(ARCH)))
 	@$(call set,BOOTLOADER,grubpcboot)
 endif

conf.d/mixin.mk

@@ -95,18 +95,22 @@ mixin/regular-deepin: use/x11/deepin use/browser/chromium +nm; @:
 mixin/regular-gnome: use/x11/gnome use/fonts/ttf/redhat +nm
 	@$(call add,THE_PACKAGES,power-profiles-daemon)
 	@$(call add,THE_PACKAGES,gnome-terminal)
+	@$(call add,THE_PACKAGES,gnome-software)
 	@$(call add,PINNED_PACKAGES,gnome-terminal:Required)
 	@$(call add,THE_PACKAGES,templates)
 	@$(call add,THE_PACKAGES,chrome-gnome-shell)
 	@$(call add,THE_PACKAGES,qt5-wayland qt6-wayland)
+	@$(call add,THE_PACKAGES,cups-pk-helper cups)
+	@$(call add,THE_PACKAGES,eepm)
+	@$(call add,THE_PACKAGES,fonts-ttf-lxgw-wenkai)
 
 mixin/regular-kde5: use/x11/kde5 use/browser/falkon \
 	use/x11/kde5-display-manager-lightdm \
 	use/fonts/ttf/google use/fonts/ttf/redhat use/fonts/zerg \
 	+pulse
-	@$(call add,THE_PACKAGES,kde5-telepathy plasma5-xdg-desktop-portal-kde)
+	@$(call add,THE_PACKAGES,plasma5-xdg-desktop-portal-kde)
 	@$(call add,THE_PACKAGES,qt6-wayland)
-ifneq (,$(filter-out e2k%,$(ARCH)))
+ifneq (,$(filter-out e2k% riscv64 loongarch64,$(ARCH)))
 	@$(call add,THE_PACKAGES,falkon-kde5)
 endif
 

conf.d/phone.mk

@@ -6,12 +6,13 @@ ifeq (,$(filter-out aarch64 x86_64,$(ARCH)))
 	@$(call add,BASE_BOOTARGS,psi=1)
 endif
 
-mixin/phone-base: use/ntp/chrony use/repo use/branding/notes \
+mixin/phone-base: use/ntp/chrony use/repo use/branding/notes use/x11-autostart \
 	use/deflogin/privileges use/deflogin/xgrp use/deflogin/hardware \
 	use/deflogin/root use/l10n/ru_RU use/xdg-user-dirs
 	@$(call add,THE_BRANDING,notes indexhtml)
 	@$(call add,THE_LISTS,mobile/base)
 	@$(call add,THE_PACKAGES,polkit-rule-mobile)
+	@$(call add,THE_PACKAGES,mesa-dri-drivers)
 	@$(call add,USERS,altlinux:271828:1:1)
 	@$(call set,LOCALES,ru_RU en_US)
 	@$(call set,LOCALE,ru_RU)
@@ -30,7 +31,7 @@ vm/.phosh: vm/systemd mixin/phone-base mixin/phosh +systemd \
 	@$(call add,THE_LISTS,mobile/apps)
 
 vm/phosh: vm/.phosh use/tty/S0 use/uboot use/phone/ttyescape +efi \
-	use/firmware +x11 +plymouth +vmguest
+	use/firmware +plymouth
 	@$(call set,KFLAVOURS,un-def)
 ifeq (aarch64,$(ARCH))
 	@$(call set,VM_PARTTABLE,msdos)
@@ -40,12 +41,13 @@ endif
 
 ifeq (aarch64,$(ARCH))
 # TODO: devicetree ($root)/boot/dtb/rockchip/rk3399-pinephone-pro.dtb
-mixin/pinephone: use/x11/armsoc use/firmware use/bootloader/uboot use/tty/S2 \
+mixin/pinephone: use/firmware use/bootloader/uboot use/tty/S2 \
 	 use/phone/ttyescape
 	@$(call set,EFI_BOOTLOADER,)
 	@$(call set,UBOOT_TIMEOUT,5)
 	@$(call set,KFLAVOURS,pine)
 	@$(call add,THE_PACKAGES,eg25-manager)
+	@$(call add,THE_PACKAGES,udev-rules-modem-power)
 	@$(call add,DEFAULT_SYSTEMD_SERVICES_ENABLE,eg25-manager.service)
 
 ifeq (vm,$(IMAGE_CLASS))

conf.d/slinux.mk

@@ -9,12 +9,12 @@ distro/slinux-live: distro/.livecd-install use/slinux/base use/slinux/live
 
 distro/slinux: distro/.installer use/slinux/full use/rescue/base
 	@$(call set,INSTALLER,simply-linux)
-	@$(call add,MAIN_GROUPS,slinux/emulators-full slinux/games-base slinux/games slinux/games-full slinux/graphics-base slinux/graphics slinux/graphics-full-inkscape slinux/multimedia-full-audacity slinux/multimedia-base slinux/multimedia-full-cheese slinux/multimedia slinux/multimedia-full-shotcut slinux/multimedia-full-sound-juicer slinux/net-base)
+	@$(call add,MAIN_GROUPS,slinux/emulators-full slinux/games-base slinux/games slinux/games-full slinux/graphics-base slinux/graphics slinux/graphics-full-inkscape slinux/multimedia-full-audacity slinux/multimedia-base slinux/multimedia-full-cheese slinux/multimedia slinux/multimedia-full-shotcut slinux/net-base)
 ifneq (,$(filter-out riscv64,$(ARCH)))
 	@$(call add,MAIN_GROUPS,slinux/multimedia-full-obs-studio)
 endif
 ifneq (,$(filter-out e2k% riscv64,$(ARCH)))
-	@$(call add,MAIN_GROUPS,slinux/dropbox slinux/graphics-full-shotwell slinux/flatpak)
+	@$(call add,MAIN_GROUPS,slinux/graphics-full-shotwell slinux/flatpak)
 endif
 	@$(call set,META_VOL_ID,Simply Linux $(DISTRO_VERSION) $(ARCH))
 	@$(call set,META_APP_ID,Simply Linux $(DISTRO_VERSION) $(ARCH) $(shell date +%F))

features.in/bootloader/README

 === features.in/bootloader ===
 
 Добавление установки загрузчика основной системы, затребованного
-посредством указания "grub", "lilo" или "uboot" в BASE_BOOTLOADER.
+посредством указания "grub" или "uboot" в BASE_BOOTLOADER.
 
-Соответствующий модуль alterator добавляется в устанавливаемую
+Модуль alterator-grub добавляется в устанавливаемую
 систему (он НЕ должен требоваться пакету installer-distro-*)
 и требует пакет выбранного загрузчика. Так как для uboot такого
 модуля нет и в тоже время uboot не используется в установочных
@@ -18,6 +18,6 @@
 
 При необходимости всё-таки "пересилить" последнее изменение можно
 
-	@$(call set,BASE_BOOTLOADER,grub_или_lilo)
+	@$(call set,BASE_BOOTLOADER,grub)
 
 Реализация экспериментальная (нужно модуляризовать installer-steps).

features.in/bootloader/config.mk

-# TODO: invent something prettier (think "lilo+grub" -- or error out?)
+# TODO: invent something prettier
 # - add,BASE_PACKAGES,alterator-$* is overly additive
 #   NB: due to make target becoming having been made,
 #       the last different one wins
@@ -22,15 +22,6 @@ ifeq (distro,$(IMAGE_CLASS))
 endif
 endif
 
-ifeq (,$(filter-out i586 x86_64,$(ARCH)))
-use/bootloader/lilo: \
-	use/bootloader/%: use/bootloader
-	@$(call set,BASE_BOOTLOADER,$*)
-	@echo Warning: use/bootloader/lilo is deprecated!
-else
-use/bootloader/lilo: ; @:
-endif
-
 ifeq (,$(filter-out $(GRUB_ARCHES),$(ARCH)))
 use/bootloader/grub: \
 	use/bootloader/%: use/bootloader

features.in/browser/config.mk

@@ -9,9 +9,9 @@ BROWSERS_x86_64 := $(BROWSERS_i586) chromium seamonkey
 BROWSERS_ppc64el = netsurf epiphany falkon elinks links2
 BROWSERS_aarch64 = chromium netsurf epiphany falkon elinks links2
 BROWSERS_armh = netsurf epiphany falkon elinks links2
-BROWSERS_mipsel = seamonkey netsurf epiphany falkon \
-		  elinks links2
+BROWSERS_mipsel = seamonkey netsurf epiphany falkon elinks links2
 BROWSERS_riscv64 = epiphany midori netsurf elinks
+BROWSERS_loongarch64 = epiphany midori netsurf elinks
 BROWSERS_e2k = netsurf elinks links2
 BROWSERS_e2kv4 := $(BROWSERS_e2k)
 BROWSERS := $(BROWSERS_$(ARCH))
@@ -23,7 +23,7 @@ ifneq (,$(filter-out x86_64 aarch64,$(ARCH)))
 use/browser/chromium: use/browser/firefox use/browser/firefox/esr; @:
 endif
 
-ifeq (,$(filter-out e2k%,$(ARCH)))
+ifeq (,$(filter-out e2k% riscv64 loongarch64,$(ARCH)))
 use/browser/falkon: use/browser/firefox use/browser/firefox/esr; @:
 endif
 

features.in/grub/README

@@ -31,7 +31,9 @@
 * GRUB_CFG -- дополнительные кусочки конфигурации (например, live_rw);
 
 * GRUBTHEME -- имя темы grub, если не задана, то получает значение BRANDING
-  за вычетом традиционной приставки alt-).
+  за вычетом традиционной приставки alt-);
+
+* DISABLE_LANG_MENU -- отключает меню выбора языка в grub, если задана.
 
 Здесь производится первичная обработка конфигурационных данных,
 окончательно проверяемых и используемых уже в инструментальном чруте.

features.in/grub/generate.mk

@@ -25,11 +25,13 @@ ifneq (,$(GRUB_UI))
 GRUB_CFG := $(GRUB_CFG) gfxterm
 endif
 
+ifeq (,$(DISABLE_LANG_MENU))
 ifneq (,$(LOCALES))
 ifneq ($(words $(LOCALES)),1)
 GRUB_CFG := $(GRUB_CFG) lang
 endif
 endif
+endif
 
 ifneq (,$(KFLAVOURS))
 ifneq ($(words $(KFLAVOURS)),1)

features.in/initrd-bootchain/config.mk

 use/initrd-bootchain:
 	@$(call add_feature)
 	@$(call set,STAGE1_INITRD,initrd-bootchain)
-	@$(call set,STAGE1_PACKAGES,make-initrd-bootchain kbd)
+	@$(call set,STAGE1_PACKAGES,make-initrd-bootchain)
 	@$(call set,STAGE1_INITRD_TYPEARGS,$(shell echo "root=bootchain bootchain=fg,altboot automatic"))
 	@$(call set,STAGE1_INITRD_BOOTMETHOD,$(shell echo "method:disk,uuid:$(UUID_ISO)"))
 	@$(call set,STAGE1_INITRD_STAGE2_OPTION,stagename)

features.in/initrd-bootchain/stage1/scripts.d/80-make-initrd-for-bootchain

@@ -21,7 +21,7 @@ cd /.image
 
 cp /etc/initrd.mk .disk/
 cat >>.disk/initrd.mk <<EOF
-FEATURES += add-modules compress cleanup rdshell kbd
+FEATURES += add-modules compress cleanup rdshell
 FEATURES += bootchain-localdev
 FEATURES += bootchain-liverw
 FEATURES += bootchain-waitdev

features.in/initrd-propagator/config.mk

@@ -5,4 +5,3 @@ use/initrd-propagator:
 	@$(call set,STAGE1_INITRD_TYPEARGS,$(shell echo "changedisk automatic"))
 	@$(call set,STAGE1_INITRD_BOOTMETHOD,$(shell echo "method:cdrom,fuid:$(UUID_ISO)"))
 	@$(call set,STAGE1_INITRD_STAGE2_OPTION,stagename)
-	@$(call add,STAGE2_BOOTARGS,udev.log_level=err)

features.in/l10n/rootfs/image-scripts.d/50-l10n-kbd

@@ -2,6 +2,7 @@
 # partial port of livecd-setlocale (kbd bits)
 
 CONFIG=/etc/sysconfig/keyboard
+VCONSOLE_CONF=/etc/vconsole.conf
 
 # Requires: console-scripts
 if [ -s "$CONFIG" ]; then
@@ -15,3 +16,4 @@ if [ -z "$GLOBAL_KEYTABLE" ]; then
 fi
 
 echo "KEYTABLE=$GLOBAL_KEYTABLE" > "$CONFIG"
+[ -f "$VCONSOLE_CONF" ] && echo "KEYMAP=$GLOBAL_KEYTABLE" >> "$VCONSOLE_CONF"

features.in/live-install/README

@@ -3,15 +3,17 @@
 Эта фича дополняет live образ второй стадии специфическими
 для инсталяционного образа настройками и скриптовыми хуками.
 
-Рекомендуется подключать при помощи +live-installer, чтобы
-обеспечить включение типового набора связанных с инсталятором
-функций.
-
 В отличие от фичи install2 не собирается отдельный образ
 второй стадии altinst, а дополняется образ live пакетами
 инсталятора с целью уменьшить общий объём iso-образа.
 
-Установка состоит и двух этапов:
+Есть два варианта инcталятора:
+
+1. установка из live при выборе цели use/live-install
+
+2. установка из пакетов, как в altinst при выборе цели use/live-install/pkg
+
+Первый вариант выглядит так:
 
 1. Распаковывается образ live, как в livecd-install
 
@@ -21,3 +23,5 @@
 В отличии от install2 в репозиторий main помещаются только те
 пакеты, которых нет в live образе. Этим и достигается уменьшение
 размера iso-образа.
+
+Второй вариант не отличается от altinst.

features.in/live-install/config.mk

 # alterator-based installer, second (livecd) stage
 
 +live-installer: use/live-install/full; @:
++live-installer-pkg: use/live-install/full use/live-install/pkg; @:
 
 use/live-install: use/live use/metadata use/repo/main \
 	use/bootloader use/grub/live-install.cfg use/syslinux/live-install.cfg \
@@ -8,7 +9,7 @@ use/live-install: use/live use/metadata use/repo/main \
 	@$(call add_feature)
 	@$(call add,LIVE_PACKAGES,installer-common-stage2)
 	@$(call add,BASE_PACKAGES,installer-common-stage3)
-	@$(call add,LIVE_PACKAGES,installer-livecd-install)
+	@$(call add,LIVE_PACKAGES,$$(LIVE_INSTALL_PKG))
 	@$(call add,LIVE_PACKAGES,alterator-postinstall) # for auto install
 	@$(call add,LIVE_PACKAGES,xterm) # for vnc support
 	@$(call try,INSTALLER,regular)	# might be replaced later
@@ -19,28 +20,30 @@ use/live-install: use/live use/metadata use/repo/main \
 	@$(call add,LIVE_PACKAGES,glibc-gconv-modules) # for guile22
 	@$(call add,LIVE_PACKAGES,curl) # for net install
 	@$(call add,LIVE_PACKAGES,lsof) # for debug alterator-vm
-	@$(call set,GLOBAL_LIVE_INSTALL,1)
+	@$(call try,LIVE_INSTALL_PKG,installer-livecd-install)
+	@$(call try,GLOBAL_LIVE_INSTALL,1)
 	@$(call xport,BASE_BOOTLOADER)
 
 use/live-install/full: use/live-install \
 	use/syslinux/localboot.cfg use/grub/localboot_bios.cfg \
 	use/syslinux/ui/menu; @:
 
+use/live-install/pkg: use/live-install
+	@$(call set,LIVE_INSTALL_PKG,)
+	@$(call set,GLOBAL_LIVE_INSTALL,)
+
 # set up remote repositories within installed system out-of-box
 use/live-install/repo: use/live-install; @:
 ifneq (,$(filter-out e2k%,$(ARCH)))
 	@$(call add,BASE_PACKAGES,installer-feature-online-repo)
 endif
 
-use/live-install/vnc:
-	@$(call add,LIVE_PACKAGES,installer-feature-vnc-stage2)
-
 # this one expects external vncviewer to come
-use/live-install/vnc/listen: use/live-install/vnc \
+use/live-install/vnc/listen: use/live-install \
 	use/syslinux/live-install-vnc-listen.cfg use/grub/live-install-vnc-listen.cfg; @:
 
 # this one connects to a specified vncviewer --listen
-use/live-install/vnc/connect: use/live-install/vnc \
+use/live-install/vnc/connect: use/live-install \
 	use/syslinux/live-install-vnc-connect.cfg use/grub/live-install-vnc-connect.cfg; @:
 
 # add both bootloader items to be *that* explicit ;-)

features.in/live-install/scripts.d/02-cleanup-main-repo

 #!/bin/sh -efu
 
+[ -n "$GLOBAL_LIVE_INSTALL" ] || exit 0
 PREFIX=ALTLinux
 RPM_LIVE_LIST="$WORKDIR/.disk/pkglists/live/image/rpm.txt"
 [ -d "$WORKDIR/$PREFIX/RPMS.main" ] || exit 0

features.in/oem/config.mk

-use/oem: use/services use/branding use/deflogin/root
+use/oem: use/services use/branding use/deflogin/root use/l10n
 	@$(call add_feature)
 	@$(call add,DEFAULT_SERVICES_ENABLE,messagebus alteratord)
 	@$(call add,BASE_PACKAGES,alterator-setup alterator-notes)
 	@$(call add,BASE_PACKAGES,rootfs-installer-features)
 	@$(call add,PINNED_PACKAGES,rootfs-installer-features)
 	@$(call add,THE_BRANDING,alterator notes)
-	@$(call try,OEM_TARGET,setup)
+	@$(call add,BASE_BOOTARGS,systemd.unit=setup.target)
 	@$(call add,DEFAULT_SERVICES_ENABLE,$$(OEM_TARGET))
 	@$(call xport,OEM_TARGET)
 	@$(call xport,OEM_NO_CLEANUP)

features.in/oem/rootfs/image-scripts.d/99-oem-setup

 #!/bin/sh
-# this breaks the default configuration on intent
-# so that alterator-setup can run predictably
-
-TARGET=/lib/systemd/system/$GLOBAL_OEM_TARGET.target
-
-[ ! -s "$TARGET" ] ||
-	ln -s "$TARGET" /etc/systemd/system/default.target
-
-echo "LANG=en_US.utf-8" >> /etc/sysconfig/i18n
 
 # Disable cleanup alterator-setup
 [ ! "$GLOBAL_OEM_NO_CLEANUP" = yes ] ||

features.in/phone/config.mk

@@ -4,5 +4,7 @@ use/phone:
 
 # enables tty on the phone using a hotkey
 use/phone/ttyescape: use/phone use/services
+ifneq (,$(filter-out riscv64,$(ARCH)))
 	@$(call add,THE_PACKAGES,hkdm ttyescape)
+endif
 	@$(call add,DEFAULT_SYSTEMD_SERVICES_ENABLE,hkdm)

features.in/phone/rootfs/files/etc/dconf/db/local.d/10_power

+[org/gnome/settings-daemon/plugins/power]
+sleep-inactive-battery-timeout=60

features.in/rescue/config.mk

@@ -13,7 +13,7 @@ use/rescue/base: use/rescue/.base
 use/rescue: use/rescue/.base use/services use/firmware/full +wireless
 	@$(call add,DEFAULT_SERVICES_DISABLE,rpcbind)
 ifeq (,$(filter-out i586 x86_64,$(ARCH)))
-	@$(call add,RESCUE_PACKAGES,lilo syslinux)
+	@$(call add,RESCUE_PACKAGES,syslinux)
 endif
 	@$(call add,RESCUE_LISTS,\
 		$(call tags,(base || extra || server || misc || fs) \

features.in/services/README

@@ -19,3 +19,6 @@ DEFAULT_SYSTEMD_SERVICES_* и SYSTEMD_SERVICES_*.
 
 Для включения служб systemd-logind нужно использовать
 DEFAULT_SYSTEMD_USER_SERVICES_* и SYSTEMD_USER_SERVICES_*.
+
+Для того, чтобы замаскировать или размаскировать юнит systemd используйте
+SYSTEMD_SERVICES_MASK и SYSTEMD_SERVICES_UNMASK.

features.in/services/config.mk

@@ -8,6 +8,8 @@ use/services: sub/rootfs
 	@$(call xport,DEFAULT_SYSTEMD_SERVICES_DISABLE)
 	@$(call xport,SYSTEMD_SERVICES_ENABLE)
 	@$(call xport,SYSTEMD_SERVICES_DISABLE)
+	@$(call xport,SYSTEMD_SERVICES_MASK)
+	@$(call xport,SYSTEMD_SERVICES_UNMASK)
 	@$(call xport,DEFAULT_SYSTEMD_USER_SERVICES_ENABLE)
 	@$(call xport,DEFAULT_SYSTEMD_USER_SERVICES_DISABLE)
 	@$(call xport,SYSTEMD_USER_SERVICES_ENABLE)

features.in/services/install2/image-scripts.d/10-services

@@ -17,16 +17,17 @@ switch() {
 
 	sname="${sname%.service}"
 	sname="${sname%.socket}"
+	sname="${sname%.target}"
 
 	[ -n "$CHECK_FILES" ] && \
-		grep -E -qs "^[[:blank:]]*$sname(.service|.socket)?[[:blank:]]*$" \
+		grep -E -qs "^[[:blank:]]*$sname(.service|.socket|.target)?[[:blank:]]*$" \
 			$CHECK_FILES && return ||:
 
 	# avoid service duplication: drop sevice without unit type
 	[ "$sname" = "$1" ] || shell_config_del "$STATUS" "$sname"
 
 	case "$2" in
-	on|off|enabled|disabled)
+	on|off|enabled|disabled|mask|unmask)
 		shell_config_set "$STATUS" "$1" "$2";;
 	esac
 }
@@ -84,6 +85,29 @@ fi
 
 rm "$STATUS"
 
+# Mask|Unmask systemd units
+STATUS=`mktemp`
+CHECK_FILES=
+
+for f in systemd-mask systemd-unmask; do
+	[ -s "$CONFDIR/$f" ] || continue
+	CHECK_FILES="$CHECK_FILES $CONFDIR/$f"
+done
+
+for i in $GLOBAL_SYSTEMD_SERVICES_MASK;    do switch $i mask;   done
+for i in $GLOBAL_SYSTEMD_SERVICES_UNMASK;  do switch $i unmask; done
+
+SERVICES="$GLOBAL_SYSTEMD_SERVICES_MASK $GLOBAL_SYSTEMD_SERVICES_UNMASK"
+SERVICES="$(echo $SERVICES | tr " " "\n" | sort -u)"
+
+for i in $SERVICES; do
+	maskunmask="$(shell_config_get "$STATUS" "$i")"
+	[ -n "$maskunmask" ] || continue
+	echo "$i" >> "$CONFDIR"/systemd-"$maskunmask"ed
+done
+
+rm "$STATUS"
+
 # Enable|Disable logind services
 STATUS=`mktemp`
 CHECK_FILES=

features.in/services/rootfs/image-scripts.d/10-services

@@ -17,6 +17,10 @@ switch() {
 		cc=on; sc=enable;;
 	off)
 		cc=off; sc=disable;;
+	unmask)
+		sc=unmask;;
+	mask)
+		sc=mask;;
 	esac
 
 	{
@@ -43,6 +47,8 @@ for i in $GLOBAL_DEFAULT_SYSTEMD_SERVICES_DISABLE; do switch $i off; done
 # explicitly specified behaviour
 for i in $GLOBAL_SYSTEMD_SERVICES_ENABLE;  do switch $i on;  done
 for i in $GLOBAL_SYSTEMD_SERVICES_DISABLE; do switch $i off; done
+for i in $GLOBAL_SYSTEMD_SERVICES_MASK;    do switch $i mask;   done
+for i in $GLOBAL_SYSTEMD_SERVICES_UNMASK;  do switch $i unmask; done
 
 ## systemd-logind services
 SYSTEMD_USER='--user --global'

features.in/slinux/config.mk

@@ -19,6 +19,8 @@ use/slinux/services-enabled: use/services
 	@$(call add,SYSTEMD_SERVICES_ENABLE,cups.service)
 	@$(call add,SYSTEMD_SERVICES_ENABLE,cups.socket)
 	@$(call add,SYSTEMD_SERVICES_ENABLE,cups-browsed.service)
+	@$(call add,SYSTEMD_SERVICES_ENABLE,dnsmasq.service)
+	@$(call add,SYSTEMD_SERVICES_ENABLE,fstrim.timer)
 	@$(call add,SYSTEMD_SERVICES_ENABLE,lightdm.service)
 	@$(call add,SYSTEMD_SERVICES_ENABLE,lvm2-monitor.service)
 	@$(call add,SYSTEMD_SERVICES_ENABLE,network.service)
@@ -38,10 +40,14 @@ use/slinux/services-disabled: use/services
 	@$(call add,SYSTEMD_SERVICES_DISABLE,openvpn.service)
 	@$(call add,SYSTEMD_SERVICES_DISABLE,sshd.service)
 	@$(call add,SYSTEMD_SERVICES_DISABLE,syslogd.service)
-	@$(call add,SYSTEMD_SERVICES_DISABLE,dnsmasq.service)
 
 use/slinux/services: use/slinux/services-enabled use/slinux/services-disabled
 
+use/slinux/control: use/control
+	@$(call add,CONTROL,libnss-role:enabled)
+	@$(call add,CONTROL,sudoers:relaxed)
+	@$(call add,CONTROL,sudowheel:enabled)
+
 use/slinux/vm-base:: vm/systemd \
 	use/oem/distro use/slinux/mixin-base
 	@$(call add,THE_LISTS,slinux/games-base)
@@ -62,13 +68,17 @@ use/slinux/vm-base:: use/oem/vnc
 	@$(call set,KFLAVOURS,un-def)
 endif
 
-use/slinux/mixin-base: use/slinux use/x11/xorg use/x11/lightdm/gtk +pulse \
+use/slinux/mixin-base: use/slinux \
+	+x11 use/x11/3d \
+	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
+	use/xdg-user-dirs use/xdg-user-dirs/deep \
+	use/slinux/services use/slinux/control
+	@$(call set,NVIDIA_PACKAGES,nvidia-xconfig)
 	@$(call set,DOCS,simply-linux)
 	@$(call add,THE_LISTS,gnome-p2p)
 	@$(call add,THE_LISTS,slinux/misc-base)
@@ -113,13 +123,14 @@ use/slinux/base: use/isohybrid use/luks \
 	use/branding/complete \
 	mixin/desktop-installer \
 	use/firmware/laptop \
-	use/vmguest/kvm/x11 use/stage2/kms \
+	use/vmguest/kvm/x11 use/stage2/kms/nvidia \
 	use/e2k/multiseat/full use/e2k/x11/101 use/e2k/sound/401 \
 	use/slinux/mixin-base
 ifeq (,$(filter-out i586 x86_64,$(ARCH)))
 	@$(call set,BOOTLOADER,grubpcboot)
 endif
-	@$(call add,STAGE2_PACKAGES,xorg-conf-libinput-touchpad)
+	@$(call add,INSTALL2_PACKAGES,xorg-conf-libinput-touchpad)
+	@$(call add,STAGE2_PACKAGES,btrfs-progs)
 
 use/slinux/full: use/slinux/base \
 	use/install2/repo

features.in/slinux/live/image-scripts.d/30-local-time

-#!/bin/bash
-# Set system time to local time.
-
-CONFIG="/etc/sysconfig/clock"
-sed -i 's/^UTC=true/UTC=false/' "$CONFIG"

features.in/x11-autostart/config.mk

-use/x11-autostart: use/x11
+use/x11-autostart:
 	@$(call add_feature)
 ifeq (distro,$(IMAGE_CLASS))
 	@$(call add,BASE_PACKAGES,installer-feature-runlevel5-stage3)	###

features.in/x11-autostart/rootfs/image-scripts.d/40-x11-autostart

 #!/bin/sh
-
-if [ ! -x /usr/bin/X ]; then
-	echo "SKIP autostart: X not installed" >&2
-	exit 0
-fi
-
 ## setup automated graphical session startup
+
 INITTAB=/etc/inittab
 if [ -f "$INITTAB" ]; then
 	[ -z "$runlevel" ] && runlevel=5
 	sed -i "s,^\(id:\)\(.*\)\(:initdefault.*\),\\1$runlevel\\3," "$INITTAB"
 fi
 
-## ...and systemd, if any
-## NB: alterator-setup's backup file can present a nice catch if left around
-rm -f /etc/systemd/system/default.target{,.bak}
+TARGET=/lib/systemd/system/graphical.target
+if [ -s "$TARGET" ]; then
+        rm -f /etc/systemd/system/default.target
+        ln -s "$TARGET" /etc/systemd/system/default.target
+fi
 
 :

image.in/Makefile

@@ -90,7 +90,7 @@ imagedir:
 	@mkdir -p "$(IMAGE_OUTDIR)"
 
 postprocess: | $(addprefix postprocess-,$(sort $(POSTPROCESS_TARGETS)))
-	@OUTSIZE="`ls -lh "$(IMAGE_OUTPATH)" | cut -f5 -d' '`"; \
+	@OUTSIZE="`ls -hs "$(IMAGE_OUTPATH)" | cut -f1 -d' '`"; \
 	if [ ! -n "$$OUTSIZE" ]; then \
 		echo "** error: $(IMAGE_OUTPATH) missing" >&2; \
 		exit 1; \

lib/vm.mk

@@ -9,12 +9,6 @@ ifeq (vm,$(IMAGE_CLASS))
 vm/.bare: profile/bare
 	@$(call add,BASE_PACKAGES,interactivesystem shadow-utils e2fsprogs)
 
-ifeq (,$(filter-out i586 x86_64,$(ARCH)))
-vm/.base-lilo: vm/.bare use/bootloader/lilo; @:
-else
-vm/.base-lilo: vm/.base-grub; @:
-endif
-
 ifeq (,$(filter-out i586 x86_64 ppc64le,$(ARCH)))
 vm/.base-grub: vm/.bare use/bootloader/grub; @:
 else

pkg.in/groups/slinux/dropbox.directory

-[Desktop Entry]
-Encoding=UTF-8
-Type=Directory
-Name=Dropbox support
-X-Alterator-PackageList=slinux/dropbox
-X-Alterator-Required=no
-Name[ru_RU]=Поддержка Dropbox

pkg.in/groups/slinux/multimedia-full-sound-juicer.directory

-[Desktop Entry]
-Encoding=UTF-8
-Type=Directory
-Name=Audio CD Extractor
-Name[ru_RU]=Программа копирования звуковых CD
-X-Alterator-PackageList=slinux/multimedia-full-sound-juicer
-X-Alterator-Parent=slinux/multimedia
-X-Alterator-Required=yes
-X-Alterator-Conflicts=multimedia
-Categories=XFCE

pkg.in/lists/centaurus/base-server

@@ -67,6 +67,7 @@ sg3_utils
 
 # servers
 openssh-server
+openssh-common
 openssh-blacklist
 postfix
 postfix-tls

pkg.in/lists/centaurus/mate

@@ -69,7 +69,7 @@ alterator-standalone
 alterator-net-pppoe
 alterator-net-pptp
 alterator-net-openvpn
-alterator-nsswitch
+alterator-auth
 alterator-packages
 alterator-pkg
 alterator-profile

pkg.in/lists/education/misc

@@ -217,6 +217,7 @@ cpufreq-simple@X86
 hplip-sane
 gutenprint-cups-ppds
 sane-airscan
+ipp-usb
 udev-rule-generator-cdrom
 xorg-drv-synaptics
 xorg-conf-synaptics
@@ -326,3 +327,6 @@ task-edu-tools@META
 ca-certificates-digital.gov.ru
 
 xauthority-hostname-updater
+
+# Additional repositories
+apt-conf-r7@x86_64

pkg.in/lists/lilo

-lilo@X86

pkg.in/lists/mobile/apps

@@ -14,7 +14,7 @@ geary
 
 # multimedia
 megapixels
-cheese
+snapshot
 mpv
 totem
 amberol
@@ -34,6 +34,12 @@ secrets
 # emoji (see also https://bugzilla.altlinux.org/46471)
 fonts-ttf-google-noto-emoji-color
 
+# CJK fonts
+fonts-ttf-lxgw-wenkai
+
+# Dictaphone
+gnome-sound-recorder
+
 # misc
 gnome-calculator
 gnome-clocks
@@ -41,7 +47,6 @@ gnome-calendar
 gnome-characters
 gnome-maps
 gnome-weather
-gnome-screenshot
 grim
 wallpapers-mobile
 # libadwaita theme ported to gtk3

pkg.in/lists/mobile/base

@@ -67,4 +67,4 @@ udev-rules-rfkill-uaccess
 
 xdg-user-dirs
 
-android-tools
+android-tools@!riscv64

pkg.in/lists/mobile/phosh

@@ -11,6 +11,8 @@ bluez
 
 # base applications
 gnome-control-center
+phosh-mobile-settings
+gnome-software
 
 # file manager
 nautilus

pkg.in/lists/slinux/dropbox

-dropbox
-thunar-dropbox-plugin
-python3-module-gpg

pkg.in/lists/slinux/emulators-full

 wine@X86
 i586-wine@x86_64
-wine-mono@X86
+wine-mono-8.0.0@X86
 winetricks@X86
 # For winetricks
 zenity@X86
 
-i586-xorg-dri-.*@x86_64
+# Exclude nouveau
+i586-xorg-dri-.*@x86_64 i586-xorg-dri-nouveau-@x86_64 xorg-dri-nouveau-@X86
+
 cabextract@X86
 dosbox
 #kernel-modules-virtualbox-@KERNEL@

pkg.in/lists/slinux/graphics-base

 gimp
 gimp-plugin-gutenprint
+gimp-help-ru
 xsane-gimp2
 # inkscape
 gphoto2

pkg.in/lists/slinux/misc-base

@@ -9,6 +9,10 @@ strace
 anacron
 os-prober
 make-initrd-lvm
+make-initrd-mdadm
+make-initrd-ucode@X86
+iucode_tool@X86
+firmware-intel-ucode@X86
 shadow-change
 dhcpcd
 test-audio
@@ -16,7 +20,7 @@ pa-conf-switch-on-connect
 man-pages
 etcnet-defaults-desktop
 mdadm
-make-initrd-mdadm
+btrfs-progs
 gzip-utils
 
 telnet
@@ -45,6 +49,7 @@ fonts-ttf-google-droid-.*
 fonts-ttf-ubuntu-font-family
 fonts-ttf-liberation
 fonts-ttf-dejavu
+icon-theme-Papirus
 gnome-icon-theme
 gnome-icon-theme-symbolic
 gnome-keyring
@@ -79,6 +84,7 @@ packagekit
 
 alt-rootfs-installer
 beesu
+userpasswd
 cups
 cups-filters
 cups-pdf
@@ -90,6 +96,9 @@ printer-drivers-base
 printer-driver-brlaser
 printer-driver-oki
 
+libnss-role
+alterator-roles-common
+
 hostname-hook-hosts
 libnss-mdns
 i586-glibc-nss@x86_64
@@ -165,12 +174,13 @@ rekonq-@X86
 rekonq-@ARM
 xdg-user-dirs
 x-cursor-theme-jimmac
+gtk-theme-classiclooks
 
 plymouth@!E2K
 #branding-simply-linux-bootsplash
 
 # Office
-java-11-openjdk@!E2K,mipsel
+java-17-openjdk@!E2K,mipsel
 java-1.8.0-openjdk@E2K,mipsel
 atril-gtk
 atril-gtk-djvu
@@ -219,3 +229,10 @@ eepm
 
 # Russian Trusted Root CA
 ca-certificates-digital.gov.ru
+
+# NVIDIA drivers
+#kernel-modules-nvidia-@KERNEL_MOD@
+nvidia-xconfig@X86
+nvidia-xconfig@aarch64
+
+polkit-rule-udisks2-mount

pkg.in/lists/slinux/misc-full

@@ -5,11 +5,6 @@ stardict-mueller7
 stardict-wn
 #stardict-engcom
 
-# NVIDIA drivers
-#kernel-modules-nvidia-@KERNEL_MOD@
-nvidia-xconfig@X86
-nvidia-xconfig@aarch64
-
 # ATI proprietary driver
 #fglrx_glx
 #fglrx-tools
@@ -44,7 +39,6 @@ jack-audio-connection-kit
 osec-mailreport
 slocate
 adjtimex
-wodim
 
 opensc
 

pkg.in/lists/slinux/multimedia-full-sound-juicer

-sound-juicer

pkg.in/lists/slinux/not-install-full

@@ -3,7 +3,7 @@
 #firmware-kernel-led-ws
 
 # For steam
-i586-nvidia_glx_.*@x86_64
+#i586-nvidia_glx_.*@x86_64
 #i586-fglrx_glx@x86_64
 
 # Bumblebee
@@ -16,6 +16,3 @@ bumblebee@X86
 # Spice client
 libspice-gtk3
 #spice-client
-
-# Nvidia drivers
-nvidia_glx_.*@X86

pkg.in/lists/slinux/xfce-base

@@ -40,7 +40,6 @@ xfce4-cpufreq-plugin
 #xfce4-globalmenu-plugin
 xfce4-xkb-plugin
 xfce4-timer-plugin
-xfce4-datetime-plugin
 xfce4-places-plugin
 xfce4-time-out-plugin
 xfce4-fsguard-plugin
@@ -52,7 +51,6 @@ xfce4-eyes-plugin
 xfce4-notes-plugin
 xfce4-netload-plugin
 xfce4-mount-plugin
-xfce4-weather-plugin
 xfce4-systemload-plugin
 xfce4-cpugraph-plugin
 xfce4-pulseaudio-plugin

pkg.in/lists/tagged/desktop+gnustep

@@ -10,7 +10,7 @@ gnustep-gui
 gnustep-gorm
 gnustep-gworkspace
 
-gnustep-themes-Gtk
+#gnustep-themes-Gtk
 gnustep-themes-Neos
 gnustep-themes-Nesedah
 gnustep-themes-Narcissus

pkg.in/lists/tagged/rescue+extra

@@ -20,6 +20,8 @@ disktype
 #evms-ncurses
 # fio pulls in a bunch of huge libraries down to libicu
 #fio
+f3
+fdutils@X86
 gpart
 hddtemp
 idle3-tools
@@ -138,7 +140,7 @@ cifs-utils
 curl
 davfs2
 dhcpdump
-dsniff
+#dsniff
 elinks
 exabgp
 fping