Merge tag 'v1.5.8' into sisyphus

bin/tar2fs

@@ -77,7 +77,12 @@ if [ "$BOOTLOADER" == grub-efi -o "$BOOTTYPE" == EFI ]; then
 	EFIPART="1"
 	EFIPARTSIZEM="256"
 	EFIPARTFSTYPE="fat"
-	ROOTPART="2"
+	if [ "$ARCH" = x86_64 ]; then
+		BIOSPART="2"
+		ROOTPART="3"
+	else
+		ROOTPART="2"
+	fi
 fi
 
 # tested to work: ext[234], jfs
@@ -217,7 +222,7 @@ trap exit_handler EXIT ERR
 
 # prepare disk image and a filesystem inside it
 rm -f -- "$IMG"
-OFFSET="$(($CUR_BOUNDARY + $EFIPARTSIZEM + $BOOTLOADERPARTSIZEM + $BOOTSIZEM + $ROOTSIZEM - 1))"
+OFFSET="$(($CUR_BOUNDARY + $EFIPARTSIZEM + $BOOTLOADERPARTSIZEM + $BOOTSIZEM + ${BIOSPART:+1} + $ROOTSIZEM - 1))"
 dd if=/dev/zero of="$IMG" conv=notrunc bs=$MB count=1 seek="$OFFSET"
 losetup -f "$IMG"
 LOOPDEV=$(losetup -j "$IMG" | cut -f 1 -d ':')
@@ -249,6 +254,12 @@ if [ -n "$EFIPART" ]; then
 	fi
 fi
 
+if [ -n "$BIOSPART" ]; then
+	parting mkpart bios $((CUR_BOUNDARY+1))MiB $(($CUR_BOUNDARY + 2))MiB
+	CUR_BOUNDARY="$(($CUR_BOUNDARY + 1))"
+	parting set "$BIOSPART" bios on
+fi
+
 if [ -n "$BOOTPART" ]; then
 	BOOTDEV="$BLOCKDEV$BOOTPART"
 	mkpart "$BOOTSIZEM"
@@ -440,19 +451,36 @@ grub-efi)
 	case "$ARCH" in
 		x86_64)
 			chroot "$ROOTFS" grub-install --target=i386-efi --recheck \
+			  --no-nvram --uefi-secure-boot
+			chroot "$ROOTFS" grub-install --target=x86_64-efi --recheck \
+			  --no-nvram --uefi-secure-boot
+			chroot "$ROOTFS" grub-install --target=i386-efi --recheck \
 			  --removable --uefi-secure-boot
 			chroot "$ROOTFS" grub-install --target=x86_64-efi --recheck \
 			  --removable --uefi-secure-boot
-			sed -i 's/initrd16/initrdefi/g' "$ROOTFS/boot/grub/grub.cfg"
-			sed -i 's/linux16/linuxefi/g' "$ROOTFS/boot/grub/grub.cfg"
+			sed -i 's/initrd16/initrd/g' "$ROOTFS/boot/grub/grub.cfg"
+			sed -i 's/linux16/linux/g' "$ROOTFS/boot/grub/grub.cfg"
+			[ -n "$BIOSPART" ] &&
+				chroot "$ROOTFS" grub-install --target=i386-pc "$LOOPDEV"
 		;;
 		aarch64)
 			chroot "$ROOTFS" grub-install --target=arm64-efi --recheck \
+			  --no-nvram --uefi-secure-boot
+			chroot "$ROOTFS" grub-install --target=arm64-efi --recheck \
 			  --removable --uefi-secure-boot
 		;;
 		riscv64)
 			chroot "$ROOTFS" grub-install --target=riscv64-efi --recheck \
+			  --no-nvram --uefi-secure-boot
+			chroot "$ROOTFS" grub-install --target=riscv64-efi --recheck \
 			  --removable --uefi-secure-boot
+		;;
+		loongarch64)
+			chroot "$ROOTFS" grub-install --target=loongarch64-efi --recheck \
+			  --no-nvram --uefi-secure-boot
+			chroot "$ROOTFS" grub-install --target=loongarch64-efi --recheck \
+			  --removable --uefi-secure-boot
+		;;
 	esac
 	sed -i '/GRUB_DISABLE_OS_PROBER=true/d' "$ROOTFS/etc/sysconfig/grub2"
 	;;
@@ -462,8 +490,8 @@ grub)
 	case "$ARCH" in
 		*86*)
 			chroot "$ROOTFS" grub-install --target=i386-pc "$LOOPDEV"
-			sed -i 's/initrdefi/initrd16/g' "$ROOTFS/boot/grub/grub.cfg"
-			sed -i 's/linuxefi/linux16/g' "$ROOTFS/boot/grub/grub.cfg"
+			sed -i 's/initrdefi/initrd/g' "$ROOTFS/boot/grub/grub.cfg"
+			sed -i 's/linuxefi/linux/g' "$ROOTFS/boot/grub/grub.cfg"
 		;;
 		ppc*)
 			[ -z "$LOOPBOOTLOADER" ] ||

conf.d/e2k.mk

@@ -27,7 +27,7 @@ vm/e2k-mate: vm/.e2k-rescue use/deflogin/live use/x11/mate use/x11/lightdm/gtk \
 	@$(call add,THE_PACKAGES,LibreOffice-langpack-ru)
 
 vm/e2k-lxqt: vm/.e2k-rescue mixin/e2k-desktop
-	@$(call add,THE_LISTS,$(call tags,desktop && lxqt && !extra))
+	@$(call add,THE_LISTS,$(call tags,desktop && lxqt))
 
 vm/e2k-builder: vm/.e2k-rescue use/dev/builder/base
 	@$(call add,KFLAVOURS,elbrus-8c elbrus-4c)

conf.d/live.mk

@@ -10,7 +10,7 @@ distro/syslinux: distro/.boot \
 	@$(call set,BOOTLOADER,isolinux)
 endif
 
-ifeq (,$(filter-out i586 x86_64 aarch64 ppc64le riscv64,$(ARCH)))
+ifeq (,$(filter-out i586 x86_64 aarch64 ppc64le riscv64 loongarch64,$(ARCH)))
 distro/grub: distro/.boot use/grub use/hdt use/memtest +efi \
 	use/grub/localboot_bios.cfg use/grub/sdab_bios.cfg; @:
 ifeq (,$(filter-out i586 x86_64,$(ARCH)))

conf.d/mixin.mk

@@ -86,8 +86,8 @@ mixin/regular-icewm: use/fonts/ttf/redhat +icewm +nm-gtk
 mixin/regular-gnustep: use/x11/gnustep use/mediacheck use/browser/seamonkey
 	@$(call add,THE_BRANDING,graphics)
 
-mixin/regular-cinnamon: use/x11/cinnamon use/x11/lightdm/slick +nm-gtk \
-	use/fonts/ttf/google use/net/nm/mmgui use/im; @:
+mixin/regular-cinnamon: use/x11/cinnamon use/x11/lightdm/slick +nm \
+	use/fonts/ttf/google use/im; @:
 
 mixin/regular-deepin: use/x11/deepin use/browser/chromium +nm; @:
 

conf.d/phone.mk

-mixin/waydroid:
+mixin/waydroid: ; @:
+ifeq (,$(filter-out aarch64 x86_64,$(ARCH)))
 	@$(call add,THE_PACKAGES,libgbinder1 waydroid)
 	@$(call add,THE_KMODULES,anbox)
 	@$(call add,DEFAULT_SYSTEMD_SERVICES_ENABLE,waydroid-container.service)
 	@$(call add,BASE_BOOTARGS,psi=1)
+endif
 
 mixin/phone-base: use/ntp/chrony use/repo use/branding/notes \
 	use/deflogin/privileges use/deflogin/xgrp use/deflogin/hardware \
@@ -14,13 +16,15 @@ mixin/phone-base: use/ntp/chrony use/repo use/branding/notes \
 	@$(call add,CONTROL,fusermount:public)
 	@$(call add,CONTROL,libnss-role:disabled)
 
-mixin/phosh: use/x11/gdm use/x11-autologin +pulse +nm +nm-native \
-	use/services
-	@$(call add,THE_PACKAGES,phosh mutter-gnome xorg-xwayland)
+mixin/phosh: use/services +pulse +nm +nm-native
+	@$(call add,THE_PACKAGES,phosh xdg-desktop-portal-gtk)
+	@$(call add,THE_PACKAGES,gnome-control-center xorg-xwayland)
 	@$(call add,THE_PACKAGES,gnome-terminal gedit)
 	@$(call add,THE_PACKAGES,qt5-wayland qt6-wayland)
 	@$(call add,THE_PACKAGES,bluez)
+	@$(call add,THE_PACKAGES,tracker3 nautilus)
 	@$(call add,THE_LISTS,mobile/apps)
+	@$(call add,DEFAULT_SERVICES_ENABLE,phosh)
 	@$(call add,DEFAULT_SERVICES_ENABLE,bluetoothd)
 	@$(call set,DEFAULT_SESSION,phosh)
 
@@ -28,8 +32,13 @@ ifeq (vm,$(IMAGE_CLASS))
 vm/.phosh: vm/systemd mixin/phone-base mixin/phosh +systemd \
 	mixin/waydroid; @:
 
-vm/phosh: vm/.phosh use/tty/S0 use/efi/grub use/bootloader/uboot \
-	use/firmware +x11 +plymouth +vmguest; @:
+vm/phosh: vm/.phosh use/tty/S0 use/efi/grub use/uboot use/phone \
+	use/firmware +x11 +plymouth +vmguest
+	@$(call set,KFLAVOURS,un-def)
+ifeq (aarch64,$(ARCH))
+	@$(call set,VM_PARTTABLE,msdos)
+	@$(call set,VM_BOOTTYPE,EFI)
+endif
 endif
 
 ifeq (aarch64,$(ARCH))
@@ -43,6 +52,6 @@ mixin/pinephone: use/x11/armsoc use/firmware use/bootloader/uboot use/tty/S2 \
 	@$(call add,DEFAULT_SYSTEMD_SERVICES_ENABLE,eg25-manager.service)
 
 ifeq (vm,$(IMAGE_CLASS))
-vm/pinephone-phosh: vm/.phosh mixin/pinephone; @:
+vm/pinephone-phosh: vm/.phosh mixin/pinephone +plymouth; @:
 endif
 endif

conf.d/realtime.mk

@@ -15,5 +15,4 @@ endif
 
 ifeq (vm,$(IMAGE_CLASS))
 vm/regular-cnc-rt: vm/systemd mixin/regular-vm-x11 mixin/vm-archdep mixin/cnc-rt; @:
-vm/regular-cnc-rt-efi: vm/regular-cnc-rt +efi; @:
 endif

conf.d/regular-vm.mk

@@ -14,7 +14,7 @@ vm/regular-systemd: vm/systemd-net use/vmguest/kvm use/tty/S0 \
 mixin/vm-archdep:: use/auto-resize; @:
 
 ifeq (,$(filter-out i586 x86_64 aarch64,$(ARCH)))
-mixin/vm-archdep::
+mixin/vm-archdep:: +efi
 	@$(call set,KFLAVOURS,std-def un-def)
 endif
 

conf.d/regular.mk

@@ -10,6 +10,7 @@ distro/.regular-bare: distro/.base use/kernel/net use/docs/license \
 	@$(call try,SAVE_PROFILE,yes)
 	@$(call add,STAGE1_PACKAGES,firmware-linux)
 	@$(call add,STAGE1_KMODULES,drm)
+	@$(call set,BOOTVGA,)
 ifeq (sisyphus,$(BRANCH))
 ifeq (,$(filter-out i586 x86_64,$(ARCH)))
 	@$(call set,BOOTLOADER,grubpcboot)
@@ -34,7 +35,6 @@ distro/.regular-x11: distro/.regular-base mixin/regular-x11 \
 # Network install
 distro/regular-net-install: distro/grub-net-install; @:
 ifeq (sisyphus,$(BRANCH))
-	@$(call set,BOOTCHAIN_OEM_SRV_NETINST,nightly.altlinux.org)
 ifeq (,$(filter-out i586 x86_64,$(ARCH)))
 	@$(call set,BOOTCHAIN_OEM_URL_NETINST,/sisyphus/snapshots/$(DATE)/regular-NAME-$(DATE)-$(ARCH).iso)
 else
@@ -44,7 +44,7 @@ endif
 
 # WM base target
 distro/.regular-wm: distro/.regular-x11 \
-	mixin/regular-desktop +vmguest \
+	mixin/regular-desktop \
 	use/live/rw +live-installer
 	@$(call set,INSTALLER,alt-workstation)
 	@$(call set,GRUB_DEFAULT,live)
@@ -53,7 +53,7 @@ distro/.regular-wm: distro/.regular-x11 \
 # DE base target
 # 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
+	use/firmware/laptop +systemd +systemd-optimal +vmguest
 	@$(call add,THE_PACKAGES,bluez)
 	@$(call add,DEFAULT_SERVICES_ENABLE,bluetoothd)
 
@@ -80,7 +80,6 @@ distro/.regular-jeos-base: distro/.regular-bare \
 	use/isohybrid use/branding \
 	use/install2/repo use/install2/packages \
 	use/net/etcnet
-	@$(call set,BOOTVGA,)
 	@$(call set,INSTALLER,altlinux-generic)
 	@$(call add,INSTALL2_BRANDING,alterator notes)
 	@$(call add,THE_BRANDING,alterator) # just to be cleaned up later on
@@ -95,10 +94,7 @@ distro/.regular-jeos: distro/.regular-jeos-base \
 
 distro/.regular-jeos-full: distro/.regular-jeos use/install2/vmguest \
 	use/volumes/jeos use/ntp/chrony use/bootloader/grub \
-	use/grub/localboot_bios.cfg +efi
-ifeq (sisyphus,$(BRANCH))
-	@$(call set,KFLAVOURS,un-def)
-endif
+	use/grub/localboot_bios.cfg use/kernel/latest +efi
 	@$(call add,BASE_PACKAGES,nfs-utils gdisk)
 	@$(call add,INSTALL2_PACKAGES,fdisk)
 	@$(call add,INSTALL2_PACKAGES,btrfs-progs)
@@ -195,8 +191,7 @@ distro/regular-cinnamon: distro/.regular-gtk mixin/regular-cinnamon; @:
 distro/regular-gnome: distro/.regular-desktop mixin/regular-gnome \
 	use/kernel/latest +plymouth use/browser/epiphany; @:
 
-distro/regular-lxqt: distro/.regular-gtk mixin/regular-lxqt +plymouth
-	@$(call add,THE_LISTS,$(call tags,lxqt desktop))
+distro/regular-lxqt: distro/.regular-gtk mixin/regular-lxqt +plymouth; @:
 
 distro/regular-deepin: distro/.regular-gtk mixin/regular-deepin; @:
 

conf.d/ve.mk

@@ -42,7 +42,7 @@ ve/sysvinit-etcnet: ve/base use/net/etcnet \
 	@$(call add,BASE_PACKAGES,glibc-gconv-modules glibc-locales tzdata bash-completion iptables curl)
 
 ve/systemd-bare: ve/.apt use/init/systemd \
-	use/control/sudo-su use/repo use/net-ssh
+	use/control/sudo-su use/repo
 	@$(call add,BASE_PACKAGES,interactivesystem su)
 
 ve/systemd-base: ve/systemd-bare
@@ -50,8 +50,8 @@ ve/systemd-base: ve/systemd-bare
 	@$(call add,BASE_PACKAGES,systemd-settings-disable-kill-user-processes)
 	@$(call add,BASE_PACKAGES,glibc-gconv-modules glibc-locales tzdata bash-completion iptables curl)
 
-ve/systemd-networkd: ve/systemd-base use/net/networkd/resolved; @:
-ve/systemd-etcnet: ve/systemd-base use/net/etcnet; @:
+ve/systemd-networkd: ve/systemd-base use/net-ssh use/net/networkd/resolved; @:
+ve/systemd-etcnet: ve/systemd-base use/net-ssh use/net/etcnet; @:
 
 ve/.lxc-bare: use/lxc-guest
 	@$(call add,NET_ETH,eth0:dhcp)

conf.d/vm.mk

@@ -50,7 +50,6 @@ vm/.desktop-base: vm/.desktop-bare \
 vm/icewm: vm/.desktop-base mixin/icewm; @:
 
 vm/icewm-setup: vm/.desktop-bare mixin/icewm use/oem use/x11-autostart
-	@$(call set,BRANDING,simply-linux)
 	@$(call add,THE_BRANDING,graphics)
 	@$(call add,THE_LISTS,$(call tags,base l10n))
 

features.in/bootloader/config.mk

@@ -6,7 +6,7 @@
 
 # NB: "mysterious" conflicts if BASE_BOOTLOADER is empty
 
-GRUB_ARCHES := i586 x86_64 aarch64 ppc64le riscv64
+GRUB_ARCHES := i586 x86_64 aarch64 ppc64le riscv64 loongarch64
 
 use/bootloader: use/pkgpriorities
 ifneq (,$(filter-out e2k%,$(ARCH)))

features.in/build-vm/config.mk

 # hooked from lib/sugar.mk
 use/build-vm: sub/rootfs@/ use/kernel/initrd-setup
 	@$(call add_feature)
-	@$(call set,GLOBAL_HSH_PROC,1)

features.in/cleanup/live/image-scripts.d/90-cleanup-live-pkgs

@@ -6,7 +6,8 @@ if [ -n "$GLOBAL_VERBOSE" ]; then
 	echo "** GLOBAL_CLEANUP_LIVE_PACKAGES: $GLOBAL_CLEANUP_LIVE_PACKAGES"
 fi >&2
 
-[ -n "$GLOBAL_CLEANUP_PACKAGES" $GLOBAL_CLEANUP_LIVE_PACKAGES ] || exit 0
+[ -z "$GLOBAL_CLEANUP_PACKAGES" ] && [ -z "$GLOBAL_CLEANUP_LIVE_PACKAGES" ] &&
+	exit 0
 
 CLEANUP_PACKAGES="$GLOBAL_CLEANUP_PACKAGES $GLOBAL_CLEANUP_LIVE_PACKAGES"
 

features.in/deflogin/rootfs/image-scripts.d/60-default-session → features.in/deflogin/rootfs/image-scripts.d/70-default-session

 #!/bin/sh
 
-account_dir=/var/lib/AccountsService/users
 
-[ -d /var/lib/AccountsService/users ] || exit 0
+
 [ -n "$GLOBAL_USERS" ] || exit 0
 [ -n "$GLOBAL_DEFAULT_SESSION" ] || exit 0
 
@@ -15,6 +14,12 @@ else
 	exit 1
 fi
 
+LIGHTDM_CONF=/etc/lightdm/lightdm.conf.d/autologin.conf
+[ ! -s "$LIGHTDM_CONF" ] ||
+	sed -i "s/autologin-session=.*/autologin-session=$GLOBAL_DEFAULT_SESSION/" "$LIGHTDM_CONF"
+
+account_dir=/var/lib/AccountsService/users
+[ -d /var/lib/AccountsService/users ] || exit 0
 for user in $GLOBAL_USERS; do
 	user="${user%%:*}"
 	cat > "$account_dir"/"$user"<<-EOF

features.in/efi/config.mk

-EFI_ARCHES := x86_64 aarch64 riscv64
+EFI_ARCHES := x86_64 aarch64 riscv64 loongarch64
 
 +efi: use/efi/signed; @:
 

features.in/grub/cfg.in/25install-vnc-connect.cfg

@@ -2,7 +2,7 @@
 menuentry $"VNC install "'@distro@'$" (edit to set server IP address)" --id 'vncconnect' {
   savedefault
   echo $"Loading Linux vmlinuz$KFLAVOUR ..."
-  linux /boot/vmlinuz$KFLAVOUR fastboot @initrd_bootargs@ @stagename@=altinst ramdisk_size=@altinst_size@ showopts nosplash @bootargs@ $EFI_BOOTARGS headless no_alt_virt_keyboard vncconnect=IP lang=$lang
+  linux /boot/vmlinuz$KFLAVOUR fastboot @initrd_bootargs@ @stagename@=altinst ramdisk_size=@altinst_size@ nosplash @bootargs@ $EFI_BOOTARGS headless no_alt_virt_keyboard vncconnect=IP lang=$lang
   echo $"Loading initial ramdisk ..."
   initrd /boot/@initrd@$KFLAVOUR.@initrd_ext@
 }

features.in/grub/cfg.in/25install-vnc-listen.cfg

@@ -2,7 +2,7 @@
 menuentry $"VNC install "'@distro@'$" (edit to set password and connect here)" --id 'vncpasswd' {
   savedefault
   echo $"Loading Linux vmlinuz$KFLAVOUR ..."
-  linux /boot/vmlinuz$KFLAVOUR fastboot @initrd_bootargs@ @stagename@=altinst ramdisk_size=@altinst_size@ showopts nosplash @bootargs@ $EFI_BOOTARGS headless no_alt_virt_keyboard vncpassword=VNCPWD lang=$lang
+  linux /boot/vmlinuz$KFLAVOUR fastboot @initrd_bootargs@ @stagename@=altinst ramdisk_size=@altinst_size@ nosplash @bootargs@ $EFI_BOOTARGS headless no_alt_virt_keyboard vncpassword=VNCPWD lang=$lang
   echo $"Loading initial ramdisk ..."
   initrd /boot/@initrd@$KFLAVOUR.@initrd_ext@
 }

features.in/grub/cfg.in/26live-install-vnc-listen.cfg

@@ -2,7 +2,7 @@
 menuentry $"VNC install "'@distro@'$" (edit to set password and connect here)" --id 'vncpasswd' {
   savedefault
   echo $"Loading Linux vmlinuz$KFLAVOUR ..."
-  linux /boot/vmlinuz$KFLAVOUR fastboot @initrd_bootargs@ @stagename@=live init=/usr/sbin/install2-init ramdisk_size=@live_size@ showopts nosplash @bootargs@ $EFI_BOOTARGS headless no_alt_virt_keyboard vncpassword=VNCPWD lang=$lang
+  linux /boot/vmlinuz$KFLAVOUR fastboot @initrd_bootargs@ @stagename@=live init=/usr/sbin/install2-init ramdisk_size=@live_size@ nosplash @bootargs@ $EFI_BOOTARGS headless no_alt_virt_keyboard vncpassword=VNCPWD lang=$lang
   echo $"Loading initial ramdisk ..."
   initrd /boot/@initrd@$KFLAVOUR.@initrd_ext@
 }

features.in/grub/cfg.in/30live.cfg

 menuentry $"LiveCD (no hard disk needed)" --id 'live' {
   savedefault
   echo $"Loading Linux vmlinuz$KFLAVOUR ..."
-  linux /boot/vmlinuz$KFLAVOUR fastboot live @initrd_bootargs@ @stagename@=live ramdisk_size=@live_size@ showopts lowmem vga=@bootvga@ @bootargs@ $EFI_BOOTARGS lang=$lang
+  linux /boot/vmlinuz$KFLAVOUR fastboot live @initrd_bootargs@ @stagename@=live ramdisk_size=@live_size@ lowmem vga=@bootvga@ @bootargs@ $EFI_BOOTARGS lang=$lang
   echo $"Loading initial ramdisk ..."
   initrd /boot/@initrd@$KFLAVOUR.@initrd_ext@
 }

features.in/grub/cfg.in/32live_rw.cfg

 menuentry $"LiveCD with sessions support" --id 'session' {
   savedefault
   echo $"Loading Linux vmlinuz$KFLAVOUR ..."
-  linux /boot/vmlinuz$KFLAVOUR fastboot live @initrd_bootargs@ @stagename@=live ramdisk_size=@live_size@ showopts live_rw vga=@bootvga@ @bootargs@ $EFI_BOOTARGS lang=$lang
+  linux /boot/vmlinuz$KFLAVOUR fastboot live @initrd_bootargs@ @stagename@=live ramdisk_size=@live_size@ live_rw vga=@bootvga@ @bootargs@ $EFI_BOOTARGS lang=$lang
   echo $"Loading initial ramdisk ..."
   initrd /boot/@initrd@$KFLAVOUR.@initrd_ext@
 }

features.in/grub/cfg.in/80rescue.cfg

 menuentry $"Rescue LiveCD" --id 'rescue' {
   savedefault
   echo $"Loading Linux vmlinuz$KFLAVOUR ..."
-  linux /boot/vmlinuz$KFLAVOUR changedisk fastboot live @initrd_bootargs@ @stagename@=rescue ramdisk_size=@rescue_size@ nosplash showopts @rescue_bootargs@ $EFI_BOOTARGS lowmem
+  linux /boot/vmlinuz$KFLAVOUR changedisk fastboot live @initrd_bootargs@ @stagename@=rescue ramdisk_size=@rescue_size@ nosplash @rescue_bootargs@ $EFI_BOOTARGS lowmem
   echo $"Loading initial ramdisk ..."
   initrd /boot/@initrd@$KFLAVOUR.@initrd_ext@
 }

features.in/grub/cfg.in/82rescue_rw.cfg

 menuentry $"Rescue with sessions support" --id 'rescue_session' {
   savedefault
   echo $"Loading Linux vmlinuz$KFLAVOUR ..."
-  linux /boot/vmlinuz$KFLAVOUR changedisk fastboot live @initrd_bootargs@ @stagename@=rescue ramdisk_size=@rescue_size@ nosplash showopts @rescue_bootargs@ $EFI_BOOTARGS live_rw
+  linux /boot/vmlinuz$KFLAVOUR changedisk fastboot live @initrd_bootargs@ @stagename@=rescue ramdisk_size=@rescue_size@ nosplash @rescue_bootargs@ $EFI_BOOTARGS live_rw
   echo $"Loading initial ramdisk ..."
   initrd /boot/@initrd@$KFLAVOUR.@initrd_ext@
 }

features.in/grub/cfg.in/83rescue_fm.cfg

 menuentry $"Forensic mode (leave disks alone)" --id 'rescue_forensic' {
   savedefault
   echo $"Loading Linux vmlinuz$KFLAVOUR ..."
-  linux /boot/vmlinuz fastboot live @initrd_bootargs@ @stagename@=rescue ramdisk_size=@rescue_size@ nosplash showopts @rescue_bootargs@ $EFI_BOOTARGS max_loop=16 forensic hash=@rescue_hash@ lowmem
+  linux /boot/vmlinuz fastboot live @initrd_bootargs@ @stagename@=rescue ramdisk_size=@rescue_size@ nosplash @rescue_bootargs@ $EFI_BOOTARGS max_loop=16 forensic hash=@rescue_hash@ lowmem
   echo $"Loading initial ramdisk ..."
   initrd /boot/@initrd@$KFLAVOUR.@initrd_ext@
 }

features.in/grub/cfg.in/84rescue_remote.cfg

 menuentry $"Rescue with remote SSH access (DHCP)" --id 'rescue_remote' {
   savedefault
   echo $"Loading Linux vmlinuz$KFLAVOUR ..."
-  linux /boot/vmlinuz$KFLAVOUR fastboot live @initrd_bootargs@ @stagename@=rescue ramdisk_size=@rescue_size@ nosplash showopts @rescue_bootargs@ $EFI_BOOTARGS max_loop=16 ip=dhcp port=22 rootpw=AUTO hash=@rescue_hash@ lowmem
+  linux /boot/vmlinuz$KFLAVOUR fastboot live @initrd_bootargs@ @stagename@=rescue ramdisk_size=@rescue_size@ nosplash @rescue_bootargs@ $EFI_BOOTARGS max_loop=16 ip=dhcp port=22 rootpw=AUTO hash=@rescue_hash@ lowmem
   echo $"Loading initial ramdisk ..."
   initrd /boot/@initrd@$KFLAVOUR.@initrd_ext@
 }

features.in/grub/cfg.in/85mediacheck.cfg

 menuentry $"Check this media for defects" --id 'mediachk' {
   echo $"Loading Linux vmlinuz$KFLAVOUR ..."
-  linux /boot/vmlinuz$KFLAVOUR live @initrd_bootargs@ @stagename@=mediacheck lowmem mediacheck=1 nosplash showopts @bootargs@ $EFI_BOOTARGS
+  linux /boot/vmlinuz$KFLAVOUR live @initrd_bootargs@ @stagename@=mediacheck lowmem mediacheck=1 nosplash @bootargs@ $EFI_BOOTARGS
   echo $"Loading initial ramdisk ..."
   initrd /boot/@initrd@$KFLAVOUR.@initrd_ext@
 }

features.in/grub/config.mk

 # default is plain text prompt
 # NB: might be usbflash-ready hybrid iso
 
-ifeq (,$(filter-out i586 x86_64 ppc64le aarch64 riscv64,$(ARCH)))
+ifeq (,$(filter-out i586 x86_64 ppc64le aarch64 riscv64 loongarch64,$(ARCH)))
 
 use/grub: sub/stage1 $(ISOHYBRID:%=use/isohybrid)
 	@$(call add_feature)

features.in/hdt/config.mk

@@ -6,7 +6,6 @@ use/hdt: use/syslinux use/memtest
 	@$(call add,STAGE1_PACKAGES,dosfstools)
 	@$(call add,SYSLINUX_MODULES,hdt)
 	@$(call add,GRUB_CFG,hdt_bios)
-	@$(call set,GLOBAL_HSH_PROC,1)
 else
 use/hdt: ; @:
 endif

features.in/initrd-bootchain/generate.mk

@@ -4,7 +4,7 @@ ifneq (,$(BUILDDIR))
 
 include $(BUILDDIR)/distcfg.mk
 
-BOOTCHAIN_CFG := $(BUILDDIR)/stage1/files/bootchain
+BOOTCHAIN_CFG := $(BUILDDIR)/stage1/files/.disk/bootchain
 
 all: debug
 	@[ -s "$(BOOTCHAIN_CFG)" ] || exit 1; \

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

@@ -17,7 +17,10 @@ done
 [ -s /.in/modules ] ||
 	fatal "kernel modules set not found"
 
-cat >> /etc/initrd.mk <<EOF
+cd /.image
+
+cp /etc/initrd.mk .disk/
+cat >>.disk/initrd.mk <<EOF
 FEATURES += add-modules compress cleanup rdshell kbd
 FEATURES += bootchain-localdev
 FEATURES += bootchain-liverw
@@ -28,47 +31,38 @@ FEATURES += bootchain-cifs
 EOF
 
 for module in $(grep -v ^# /.in/modules | sort -u | tr -s '\n' ' '); do
-	echo "MODULES_TRY_ADD += $module" >> /etc/initrd.mk
+	echo "MODULES_TRY_ADD += $module" >> .disk/initrd.mk
 done
 
-dialog --create-rc /etc/dialogrc.tmp
-cat /etc/dialogrc.tmp |sed -E \
-	-e 's/^(use_colors).*/\1 = ON/' \
-	-e 's/^(use_shadow).*/\1 = ON/' \
-	-e 's/^(screen_color).*/\1 = \(WHITE,RED,ON\)/' \
-		> /etc/dialogrc.error
-rm -f /etc/dialogrc.tmp
-
-# replace generated config bootchain to stage1 chroot
-mv /.image/bootchain /etc/sysconfig/
-
-echo "PUT_FILES += /etc/sysconfig/bootchain" >> /etc/initrd.mk
-echo "PUT_FILES += /etc/dialogrc.error" >> /etc/initrd.mk
+if [ ! -f /etc/dialogrc.error ]; then
+	dialog --create-rc /tmp/dialogrc.tmp
+	cat /tmp/dialogrc.tmp |sed -E \
+		-e 's/^(use_colors).*/\1 = ON/' \
+		-e 's/^(use_shadow).*/\1 = ON/' \
+		-e 's/^(screen_color).*/\1 = \(WHITE,RED,ON\)/' \
+			> /etc/dialogrc.error
+	rm /tmp/dialogrc.tmp
+fi
 
 # FIXME: large storage systems can get that tmpfs filled up
 # with debug data as of make-initrd 2.2.12
 rm -vf  /usr/share/make-initrd/data/etc/udev/rules.d/00-debug.rules \
 	/usr/share/make-initrd/data/lib/uevent/filters/debug
 
-MAKE_INITRD_OPTS="--no-checks AUTODETECT="
+MAKE_INITRD_OPTS="--no-checks AUTODETECT= -c .disk/initrd.mk BOOTCHAIN_PATH=.disk"
 MAKE_INITRD_VER="`make-initrd -V \
 	| sed -rn 's/^make-initrd version ([0-9.]+)/\1/p'`"
 
 [ -z "$GLOBAL_VERBOSE" ] ||
 	MAKE_INITRD_OPTS="$MAKE_INITRD_OPTS -v"
 
-# copy initrd.mk to image
-mkdir -p /.image/.disk
-cp /etc/initrd.mk /.image/.disk
-cp /etc/sysconfig/bootchain /.image/.disk
-
-cd /boot
 for KVER in $kver; do
 	echo make-initrd $MAKE_INITRD_OPTS -k "$KVER" >> /.image/.disk/mkinitrd
 	make-initrd $MAKE_INITRD_OPTS -k "$KVER" ||
 		fatal "make-initrd failed"
 done
 
+cd /boot
 case `arch` in
 e2k)
 	kname=image;;

features.in/initrd-propagator/stage1/scripts.d/01-initfs

-#!/bin/sh
-echo "file	/.VERSION	@TMPDIR@/.VERSION	0644	0 0" >"$WORKDIR"/initfs

features.in/initrd-propagator/stage1/scripts.d/11-initrd-propagator

-#!/bin/sh
-# see also http://www.altlinux.org/Make-initrd-propagator
-
-echo 'FEATURES += propagator' >> /etc/initrd.mk
-
-# FIXME: #29705 workaround
-echo 'MODULES_PRELOAD += ahci' >> /etc/initrd.mk

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

@@ -18,38 +18,40 @@ done
 [ -s /.in/modules ] ||
 	fatal "kernel modules set not found"
 
-cat >> /etc/initrd.mk <<EOF
+# copy initrd.mk to image
+mkdir -p /.image/.disk
+cp /etc/initrd.mk /.image/.disk
+cd /.image
+
+cat >> .disk/initrd.mk <<EOF
+FEATURES += propagator
 FEATURES += add-modules compress cleanup
 EOF
 
 for module in $(grep -v ^# /.in/modules | sort -u | tr -s '\n' ' '); do
-	echo "MODULES_TRY_ADD += $module" >> /etc/initrd.mk
+	echo "MODULES_TRY_ADD += $module" >> .disk/initrd.mk
 done
 
-# copy initrd.mk to image
-mkdir -p /.image/.disk
-cp /etc/initrd.mk /.image/.disk
-
 # FIXME: large storage systems can get that tmpfs filled up
 # with debug data as of make-initrd 2.2.12
 rm -vf  /usr/share/make-initrd/data/etc/udev/rules.d/00-debug.rules \
 	/usr/share/make-initrd/data/lib/uevent/filters/debug
 
-MAKE_INITRD_OPTS="--no-checks AUTODETECT= "
+MAKE_INITRD_OPTS="--no-checks AUTODETECT= -c .disk/initrd.mk"
 MAKE_INITRD_VER="`make-initrd -V \
 	| sed -rn 's/^make-initrd version ([0-9.]+)/\1/p'`"
 
 [ -z "$GLOBAL_VERBOSE" ] ||
 	MAKE_INITRD_OPTS="$MAKE_INITRD_OPTS -v"
 
-cd /boot
-
 for KVER in $kver; do
-	echo make-initrd $MAKE_INITRD_OPTS -k "$KVER" >> /.image/.disk/mkinitrd
+	echo make-initrd $MAKE_INITRD_OPTS -k "$KVER" >> .disk/mkinitrd
 	make-initrd $MAKE_INITRD_OPTS -k "$KVER" ||
 		fatal "make-initrd failed"
 done
 
+cd /boot
+
 case `arch` in
 e2k)
 	kname=image;;

features.in/kernel/config.mk

@@ -6,9 +6,13 @@ else
 ifeq (,$(filter-out riscv64,$(ARCH)))
 	@$(call try,KFLAVOURS,un-def)
 else
+ifeq (,$(filter-out loongarch64,$(ARCH)))
+	@$(call try,KFLAVOURS,loongarch)
+else
 	@$(call try,KFLAVOURS,std-def)
 endif
 endif
+endif
 	@$(call xport,KFLAVOURS)
 
 use/kernel/latest: use/kernel; @:
@@ -44,6 +48,7 @@ use/kernel/disable-usb-autosuspend:
 
 # for vm targets
 use/kernel/initrd-setup: use/kernel
+	@$(call add,BASE_PACKAGES,make-initrd)
 	@$(call try,VM_FSTYPE,ext4)
 	@$(call add,VM_INITRDMODULES,$$(VM_FSTYPE))
 	@$(call add,VM_INITRDMODULES,ahci.ko ahci_platform.ko sd_mod.ko)

features.in/phone/image-scripts.d/82-background-config

-#!/bin/sh -efu
-# Set user perms on installed config
-
-chown altlinux:altlinux -R "/home/altlinux/.config"

features.in/phone/rootfs/files/etc/dconf/db/local.d/00_background

-[org/gnome/desktop/background]
-picture-uri='file:///usr/share/wallpapers/mobile/720x1440/basealt-background.png'

features.in/phone/rootfs/files/etc/dconf/profile/user

-user-db:user
-system-db:local

features.in/plymouth/config.mk

 +plymouth: use/plymouth/full; @:
 
-ifeq (,$(filter-out i586 x86_64,$(ARCH)))
+ifeq (,$(filter-out i586 x86_64 aarch64,$(ARCH)))
 # and a few aliases
 use/plymouth/live: use/plymouth/stage2; @:
 use/plymouth/install2: use/plymouth/stage2; @:

features.in/rescue/config.mk

@@ -21,7 +21,7 @@ ifneq (,$(EFI_BOOTLOADER))
 	@$(call add,RESCUE_PACKAGES,grub2-efi)
 endif
 	@$(call add,RESCUE_LISTS,\
-		$(call tags,(base || extra || server || backup || misc || fs) \
+		$(call tags,(base || extra || server || misc || fs) \
 			&& !x11 && (rescue || comm || network || security || archive)))
 
 use/rescue/rw: use/rescue use/syslinux/rescue_rw.cfg use/grub/rescue_rw.cfg; @:

features.in/services/config.mk

@@ -13,6 +13,9 @@ use/services: sub/rootfs
 	@$(call xport,SYSTEMD_USER_SERVICES_ENABLE)
 	@$(call xport,SYSTEMD_USER_SERVICES_DISABLE)
 
+user/services/dbus-brocker: use/services
+	@$(call add,DEFAULT_SERVICES_ENABLE,bluetoothd dbus-broker)
+	@$(call add,DEFAULT_SYSTEMD_USER_SERVICES_ENABLE,dbus-broker)
 
 use/services/lvm2-disable: use/services
 	@$(call add,DEFAULT_SERVICES_DISABLE,lvm2-lvmetad)

features.in/stage2/config.mk

@@ -5,7 +5,6 @@ use/stage2:: sub/stage1
 	@$(call add,STAGE1_MODLISTS,$$(FEATURES))
 	@$(call xport,STAGE1_PACKAGES)
 	@$(call xport,STAGE1_KCONFIG)
-	@$(call set,GLOBAL_HSH_PROC,1)
 
 ifneq (,$(filter-out e2k%,$(ARCH)))
 ifeq (sisyphus,$(BRANCH))

features.in/stage2/stage1/modules.d/50-stage2-net-cifs

 kernel/fs/cifs/cifs.ko
+kernel/fs/smb
 kernel/crypto/cmac.ko

features.in/tty/rootfs/image-scripts.d/50-serial

@@ -17,12 +17,8 @@ if ! grep -q "$BIN" "$CFG"; then
 	done
 fi
 
-EXTLINUXCFG=/boot/extlinux/extlinux.conf
-if [ -f "$EXTLINUXCFG" ]; then
-	sed -i "s/ quiet / /g;s/ quiet'/'/" "$EXTLINUXCFG"
-fi
-
-GRUBCFG=/etc/sysconfig/grub2
-if [ -f "$GRUBCFG" ]; then
-	sed -i "s/ quiet / /g;s/ quiet'/'/" "$GRUBCFG"
-fi
+for c in /boot/extlinux/extlinux.conf /etc/sysconfig/grub2; do
+	if [ -f "$c" ]; then
+		sed -i "s/ quiet / /g;s/ quiet'/'/" "$c"
+	fi
+done

features.in/x11/config.mk

@@ -106,8 +106,8 @@ use/x11/dm: use/x11-autostart use/pkgpriorities
 	@$(call add,PINNED_PACKAGES,$$(THE_DISPLAY_MANAGER))
 	@$(call add,DEFAULT_SERVICES_ENABLE,$$(THE_DM_SERVICE))
 
-use/x11/lightdm/gtk use/x11/lightdm/slick \
-	use/x11/lightdm/qt use/x11/lightdm/lxqt use/x11/lightdm/kde: \
+use/x11/lightdm/gtk use/x11/lightdm/slick use/x11/lightdm/kde\
+	use/x11/lightdm/autologin: \
 	use/x11/lightdm/%: use/x11/dm
 	@$(call set,THE_DISPLAY_MANAGER,lightdm-$*-greeter)
 	@$(call set,THE_DM_SERVICE,lightdm)
@@ -169,7 +169,7 @@ use/x11/lxde: use/x11
 	@$(call add,IM_PACKAGES,imsettings-lxde)
 
 use/x11/lxqt: use/x11 +pulse
-	@$(call add,THE_LISTS,$(call tags,desktop && lxqt && !extra))
+	@$(call add,THE_LISTS,$(call tags,desktop && lxqt))
 	@$(call add,IM_PACKAGES,imsettings-qt)
 
 use/x11/fvwm: use/x11

lib/boot.mk

@@ -9,7 +9,7 @@ boot/iso:
 ifeq (,$(filter-out i586 x86_64,$(ARCH)))
 	@$(call try,BOOTLOADER,isolinux)
 endif
-ifeq (,$(filter-out aarch64 riscv64,$(ARCH)))
+ifeq (,$(filter-out aarch64 riscv64 loongarch64,$(ARCH)))
 	@$(call try,BOOTLOADER,efiboot)
 endif
 ifeq (,$(filter-out e2k%,$(ARCH)))

lib/profile.mk

@@ -105,6 +105,7 @@ ifeq (sisyphus,$(BRANCH))
 else
 	@$(call try,BRANDING,alt-starterkit)
 endif
+	@$(call set,GLOBAL_HSH_PROC,1)
 	@$(call add,PINNED_PACKAGES,branding-$$(BRANDING)-alterator:Essential)
 	@$(call add,PINNED_PACKAGES,branding-$$(BRANDING)-bootsplash:Essential)
 	@$(call add,PINNED_PACKAGES,branding-$$(BRANDING)-bootloader:Essential)

lib/vm.mk

@@ -21,7 +21,7 @@ else
 vm/.base-grub: vm/.base-grub-efi; @:
 endif
 
-ifeq (,$(filter-out x86_64 aarch64 riscv64,$(ARCH)))
+ifeq (,$(filter-out x86_64 aarch64 riscv64 loongarch64,$(ARCH)))
 vm/.base-grub-efi: vm/.bare use/efi/grub; @:
 else
 vm/.base-grub-efi: vm/.bare; @:

pkg.in/lists/mobile/apps

@@ -6,10 +6,16 @@ gnome-calendar
 gnome-screenshot
 grim
 megapixels
-chromium
+cheese
+chromium@!riscv64
 firefox
-telegram-desktop
+telegram-desktop@!riscv64
 evince
 mpv
+totem
 amberol
 lollypop
+shortwave
+foliate
+geary
+wallpapers-mobile

pkg.in/lists/tagged/base+rescue

@@ -25,7 +25,7 @@ hdparm
 lsblk
 lsmount
 lvm2
-mdadm-tool
+mdadm
 open-iscsi
 photorec
 scalpel

pkg.in/lists/tagged/desktop+lxqt+extra

-# carefully chosen
-x-cursor-theme-BlueGlass3D
-x-cursor-theme-CP38
-x-cursor-theme-Obsidian
-x-cursor-theme-oxy-white
-
-# a bit lacking
-icon-theme-simple
-
-# text editor
-focuswriter
-
-# media player; see also #30556 though
-clementine@!E2K
-clementine-codecs-full@!E2K
-
-# rss-reader
-quiterss
-
-# torrent client
-qbittorrent@!E2K
-
-# xmpp client
-psi-plus
-psi-plus-plugin-birthdayreminder
-psi-plus-plugin-conferencelogger
-psi-plus-plugin-screenshot
-psi-plus-plugin-watcher
-psi-plus-l10n

pkg.in/lists/tagged/rescue+backup

-bacula11-client@!riscv64

pkg.in/lists/tagged/server+openvpn

 apt
 basesystem
-sysklogd
 etcnet
 glibc-nss
 openvpn