Merge tag 'v1.5.5' into sisyphus

conf.d/live.mk

@@ -31,6 +31,7 @@ ifeq (,$(filter-out i586 x86_64,$(ARCH)))
 endif
 	@$(call set,KFLAVOURS,un-def std-def)
 	@$(call set,GRUB_DEFAULT,network)
+	@$(call set,LOCALES,en_US ru_RU pt_BR)
 endif
 
 distro/rescue: distro/.base use/rescue use/syslinux/ui/menu use/stage2/cifs \

features.in/browser/config.mk

@@ -34,10 +34,13 @@ endif
 
 # support both firefox and firefox-esr
 use/browser/firefox: use/browser
+ifeq (,$(filter-out i586,$(ARCH)))
+	@$(call set,FX_FLAVOUR,-esr)
+endif
 	@$(call set,THE_BROWSER,firefox$$(FX_FLAVOUR))
 
 # the complete lack of dependencies is intentional
-use/browser/firefox/esr:
+use/browser/firefox/esr: ; @:
 ifneq (,$(filter-out riscv64,$(ARCH)))
 	@$(call set,FX_FLAVOUR,-esr)
 endif

features.in/install2/config.mk

@@ -24,11 +24,20 @@ use/install2: use/stage2 sub/stage2@install2 use/metadata \
 # doesn't use/install2/fs on purpose (at least so far)
 use/install2/full: \
 	use/install2/packages use/install2/vmguest use/install2/tools \
+	use/install2/lvm use/install2/cryptsetup \
 	use/syslinux/localboot.cfg use/grub/localboot_bios.cfg \
 	use/syslinux/ui/menu use/bootloader
 	@$(call add,INSTALL2_PACKAGES,xorg-drv-synaptics)
 	@$(call add,INSTALL2_PACKAGES,xorg-drv-libinput)
 
+use/install2/lvm: use/install2
+	@$(call add,INSTALL2_PACKAGES,lvm2)
+	@$(call add,BASE_PACKAGES,lvm2)
+
+use/install2/cryptsetup: use/install2
+	@$(call add,INSTALL2_PACKAGES,cryptsetup)
+	@$(call add,BASE_PACKAGES,cryptsetup)
+
 # for distributions with their own -stage3 installer part
 use/install2/stage3: use/install2
 	@$(call add,BASE_PACKAGES,installer-$$(INSTALLER)-stage3)