1.1.103-alt1

- rescue -= bootsplash

.gear/mkimage-profiles.spec

@@ -1,5 +1,5 @@
 Name: mkimage-profiles
-Version: 1.1.52
+Version: 1.1.103
 Release: alt1
 
 Summary: ALT Linux based distribution metaprofile
@@ -11,7 +11,7 @@ Source: %name-%version.tar
 Packager: Michael Shigorin <mike@altlinux.org>
 
 BuildArch: noarch
-BuildRequires: rsync asciidoc-a2x xmlgraphics-fop fonts-ttf-dejavu
+BuildRequires: rsync
 
 Requires: rsync git-core
 Requires: time schedutils sfdisk
@@ -23,12 +23,14 @@ Requires: mkimage-preinstall
 %define mpdir %_datadir/%name
 %add_findreq_skiplist %mpdir/*.in/*
 
+%def_with doc
 %define docs $HOME/docs
 
 %package doc
 Summary: %name documentation
 Group: Development/Documentation
-BuildRequires: java /proc
+%{?_with_doc:BuildRequires: java /proc}
+%{?_with_doc:BuildRequires: asciidoc-a2x fop fonts-ttf-dejavu}
 
 %description
 mkimage-profiles is a collection of bits and pieces useful for
@@ -64,21 +66,186 @@ as a book in HTML and PDF formats.
 %setup
 
 %build
+%if_with doc
 make BUILDDIR=%docs docs
+%endif
 
 %install
-mkdir -p %buildroot%mpdir
+mkdir -p %buildroot{%mpdir,%_man7dir}
 cp -a * %buildroot%mpdir
+%if_with doc
+mv %buildroot%mpdir/doc/mkimage-profiles.7 %buildroot%_man7dir/
+%endif
 
 %files
 %mpdir/
+%if_with doc
+%_man7dir/*
+%endif
 
+%if_with doc
 %files doc
 %doc README
 %doc QUICKSTART
 %doc %docs/*
+%endif
 
 %changelog
+* Mon Jan 30 2017 Michael Shigorin <mike@altlinux.org> 1.1.103-alt1
+- rescue -= bootsplash
+
+* Mon Jan 09 2017 Michael Shigorin <mike@altlinux.org> 1.1.102-alt1
+- 2017
+
+* Mon Dec 12 2016 Michael Shigorin <mike@altlinux.org> 1.1.101-alt1
+- starterkits-20161212
+
+* Mon Dec 05 2016 Michael Shigorin <mike@altlinux.org> 1.1.100-alt1
+- preparing for starterkits
+
+* Mon Nov 14 2016 Michael Shigorin <mike@altlinux.org> 1.1.99-alt1
+- xfce-sysv
+- preparing...
+
+* Mon Oct 31 2016 Michael Shigorin <mike@altlinux.org> 1.1.98-alt1
+- preparing for workstation 8.1
+
+* Mon Oct 03 2016 Michael Shigorin <mike@altlinux.org> 1.1.97-alt1
+- regular tweaks
+
+* Mon Sep 12 2016 Michael Shigorin <mike@altlinux.org> 1.1.96-alt1
+- starterkits-20160912
+
+* Mon Aug 15 2016 Michael Shigorin <mike@altlinux.org> 1.1.95-alt1
+- s/basealt/alt/g
+
+* Mon Jun 27 2016 Michael Shigorin <mike@altlinux.org> 1.1.94-alt1
+- workstation
+
+* Mon Jun 13 2016 Michael Shigorin <mike@altlinux.org> 1.1.93-alt1
+- starterkits-20160612
+
+* Mon May 30 2016 Michael Shigorin <mike@altlinux.org> 1.1.92-alt1
+- server-openstack
+
+* Mon May 23 2016 Michael Shigorin <mike@altlinux.org> 1.1.91-alt1
+- nvidia/nouveau rehash
+- overlayfs support (lakostis@)
+
+* Tue May 03 2016 Michael Shigorin <mike@altlinux.org> 1.1.90-alt1
+- starterkits-20160429
+
+* Mon Apr 25 2016 Michael Shigorin <mike@altlinux.org> 1.1.89-alt1
+- preparing for p8 starterkits
+
+* Mon Apr 11 2016 Michael Shigorin <mike@altlinux.org> 1.1.88-alt1
+- pkg.in/profiles
+
+* Mon Mar 14 2016 Michael Shigorin <mike@altlinux.org> 1.1.87-alt1
+- starterkits-20160312
+
+* Mon Feb 29 2016 Michael Shigorin <mike@altlinux.org> 1.1.86-alt1
+- junior
+
+* Mon Feb 15 2016 Michael Shigorin <mike@altlinux.org> 1.1.85-alt1
+- regular-jeos-ovz
+
+* Mon Feb 08 2016 Michael Shigorin <mike@altlinux.org> 1.1.84-alt1
+- %name(7) :)
+
+* Mon Jan 25 2016 Michael Shigorin <mike@altlinux.org> 1.1.83-alt1
+- openssh 7.x (see also #31716)
+
+* Mon Jan 11 2016 Michael Shigorin <mike@altlinux.org> 1.1.82-alt1
+- firmwarez
+
+* Mon Dec 07 2015 Michael Shigorin <mike@altlinux.org> 1.1.81-alt1
+- regular fixes
+
+* Mon Nov 30 2015 Michael Shigorin <mike@altlinux.org> 1.1.80-alt1
+- pre-starterkit cleanups
+
+* Mon Nov 16 2015 Michael Shigorin <mike@altlinux.org> 1.1.79-alt1
+- faked workaround
+
+* Mon Nov 09 2015 Michael Shigorin <mike@altlinux.org> 1.1.78-alt1
+- regular-enlightenment
+
+* Mon Oct 19 2015 Michael Shigorin <mike@altlinux.org> 1.1.77-alt1
+- webkiosk improvements
+
+* Mon Oct 12 2015 Michael Shigorin <mike@altlinux.org> 1.1.76-alt1
+- no more GREP_OPTIONS
+
+* Mon Sep 28 2015 Michael Shigorin <mike@altlinux.org> 1.1.75-alt1
+- systemd-specific hook for installer (solo@)
+
+* Mon Sep 14 2015 Michael Shigorin <mike@altlinux.org> 1.1.74-alt1
+- starterkits-20150912
+
+* Mon Sep 07 2015 Michael Shigorin <mike@altlinux.org> 1.1.73-alt1
+- im feature
+
+* Mon Aug 31 2015 Michael Shigorin <mike@altlinux.org> 1.1.72-alt1
+- starterkits alpha
+
+* Mon Aug 10 2015 Michael Shigorin <mike@altlinux.org> 1.1.71-alt1
+- docs feature
+
+* Mon Jul 20 2015 Michael Shigorin <mike@altlinux.org> 1.1.70-alt1
+- check KFLAVOURS
+
+* Mon Jun 29 2015 Michael Shigorin <mike@altlinux.org> 1.1.69-alt1
+- yet another systemd- tweak
+
+* Mon Jun 22 2015 Michael Shigorin <mike@altlinux.org> 1.1.68-alt1
+- LIVE_CLEANUP_KDRIVERS actually works
+
+* Mon Jun 08 2015 Michael Shigorin <mike@altlinux.org> 1.1.67-alt1
+- minor post-tweaks
+
+* Mon Jun 01 2015 Michael Shigorin <mike@altlinux.org> 1.1.66-alt1
+- remote rescue
+
+* Mon May 04 2015 Michael Shigorin <mike@altlinux.org> 1.1.65-alt1
+- archdep pkglists
+
+* Mon Apr 20 2015 Michael Shigorin <mike@altlinux.org> 1.1.64-alt1
+- modularized stage1 modules list
+
+* Mon Mar 30 2015 Michael Shigorin <mike@altlinux.org> 1.1.63-alt1
+- support USB3, ACPI suspend
+
+* Mon Mar 16 2015 Michael Shigorin <mike@altlinux.org> 1.1.62-alt1
+- starterkits-20150312
+
+* Mon Mar 09 2015 Michael Shigorin <mike@altlinux.org> 1.1.61-alt1
+- EFI_BOOTARGS
+
+* Mon Mar 02 2015 Michael Shigorin <mike@altlinux.org> 1.1.60-alt1
+- vmguest, install2: refactoring
+
+* Mon Feb 23 2015 Michael Shigorin <mike@altlinux.org> 1.1.59-alt1
+- regular rebase
+
+* Mon Feb 16 2015 Michael Shigorin <mike@altlinux.org> 1.1.58-alt1
+- vagrant feature (closes: #28553)
+
+* Mon Feb 09 2015 Michael Shigorin <mike@altlinux.org> 1.1.57-alt1
+- fix the lists copying fix
+
+* Mon Feb 02 2015 Michael Shigorin <mike@altlinux.org> 1.1.56-alt1
+- fix lilo check for vm images
+
+* Mon Jan 26 2015 Michael Shigorin <mike@altlinux.org> 1.1.55-alt1
+- lists copying fixed
+
+* Mon Jan 05 2015 Michael Shigorin <mike@altlinux.org> 1.1.54-alt1
+- live: don't force localboot
+
+* Mon Dec 15 2014 Michael Shigorin <mike@altlinux.org> 1.1.53-alt1
+- starterkits-20141212
+
 * Mon Nov 17 2014 Michael Shigorin <mike@altlinux.org> 1.1.52-alt1
 - docs: "7.0+" (closes: #30474)
 - l10n feature

.gear/tags/a8bbf1fe63ad5aba087020813d5b16e39104d382

@@ -0,0 +1,6 @@
+object 02708faccd41b40d50d6c8cf08f80ec3afac6f3b
+type commit
+tag v1.1.102
+tagger Michael Shigorin <mike@altlinux.org> 1483975661 +0300
+
+v1.1.102

.gear/tags/bba8b02b8e4a143d52dd9f23e65960f72b0c492e

@@ -1,6 +0,0 @@
-object 4e2e450b3a9aaf0ee20e075f3057e4e9e746886f
-type commit
-tag v1.1.51
-tagger Michael Shigorin <mike@altlinux.org> 1415640567 +0300
-
-current updates

.gear/tags/list

@@ -1 +1 @@
-bba8b02b8e4a143d52dd9f23e65960f72b0c492e v1.1.51
+a8bbf1fe63ad5aba087020813d5b16e39104d382 v1.1.102

Makefile

@@ -56,8 +56,12 @@ SHELL = /bin/bash
 		say "** goal: $@ [$$n/$(NUM_TARGETS)]"; \
 	fi; \
 	for ARCH in $(ARCHES); do \
-		if [ "$$ARCH" != "$(firstword $(ARCHES))" ]; then say; fi; \
-		say "** ARCH: $$ARCH"; \
+		if [ -z "$(QUIET)" ]; then \
+			if [ "$$ARCH" != "$(firstword $(ARCHES))" ]; then \
+				say; \
+			fi; \
+			say "** ARCH: $$ARCH"; \
+		fi; \
 		if $(MAKE) -f main.mk ARCH=$$ARCH $@ $(POSTPROC); then \
 			if [ -n "$$REPORT" ]; then \
 				$(MAKE) -f reports.mk ARCH=$$ARCH; \

QUICKSTART

@@ -5,15 +5,14 @@ http://en.altlinux.org/Hasher; large tmpfs helps a lot).
 ~~~~~~~~~
 - ALT Linux 7.0 или выше (возможна адаптация "вниз")
 - установленный mkimage (свежий, как и hasher)
-- пользователь с правом запуска hasher
+- пользователь с правом запуска hasher и подключения /proc к нему
 
 полезно
 ~~~~~~~
-- смонтированный tmpfs на несколько гигабайт
+- смонтированный tmpfs на несколько гигабайт (или укажите BUILDDIR)
   * например, в /tmp или /home/USER/hasher
   * каталог из prefix в /etc/hasher-priv/system
-- установленный git-core
-- настроенный ~/.gitconfig
+- установленный git-core и настроенный ~/.gitconfig
 
 команды
 ~~~~~~~
@@ -30,7 +29,7 @@ $ git config --global user.name "My Name"
 $ mkdir -p ~/out ~/tmp
 ----
 
-тестовая сборка::
+тестовая сборка (в каталоге mkimage-profiles)::
 ----
 $ make syslinux.iso
 ----

README

@@ -40,18 +40,23 @@
 ** могут основываться на предшественниках, расширяя их
 ** дистрибутивы также включают один или более субпрофилей по надобности
 ** желательно избегать множественного наследования, см. тж. фичи
+
 * субпрофили:
 ** список собирается в $(SUBPROFILES)
 ** базовые комплекты помещены в подкаталогах под sub.in/;
    их наборы скриптов могут расширяться фичами
+
 * фичи:
 ** законченные блоки функциональности (или наборы таковых)
 ** описываются в индивидуальных features.in/*/config.mk
 ** могут требовать другие фичи, а также субпрофили
 ** накопительный список собирается в $(FEATURES)
 ** при сборке $(BUILDDIR) содержимое фич добавляется в профиль
+
 * списки пакетов (*_LISTS):
+** _внимание_: не надо создавать фичу, если достаточно списка пакетов!
 ** просьба по возможности избегать дублирования (см. bin/pkgdups)
+
 * индивидуальные пакеты (*_PACKAGES): см. тж. conf.d/README
 
 Результат:

bin/check-recipe

@@ -0,0 +1,14 @@
+#!/bin/sh
+
+# missing "; @:" for recipeless rules makes SHELL payload useless
+# (see also ../lib/report.mk); this results in broken target graphs
+# (so REPORT=1 gets crippled)
+
+  sed 's/^[a-z]\+\/.*:.*$/\n&/' "$@" \
+| grep -vE '^(#|export|if|else|endif|define|endef)' \
+| sed ':loop /^[^#].*[^\\]\\$/N; s/\\\n//; t loop' \
+| grep -vE ':=| = | ?= | += |^\$' \
+| sed ':loop /^[a-z]\+\/.*:.*$/N; s/\n\t\+@*/\; /; t loop' \
+| grep -vE ';|^$' && exit 1 ||:
+
+# see also http://unix.stackexchange.com/questions/228547

bin/mktmpdir

@@ -2,10 +2,20 @@
 # analyze free space, preferring tmpfs over really many gigaz
 # and taking into account configured hasher workdir prefices
 
+# NB: use BUILDDIR to override autodetection (see ../QUICKSTART)
+
 # hope there aren't spaces in RM's $HOME are they?
 DIRS="$TMP $TMPDIR $HOME/hasher /tmp /var/tmp .."
 MINSIZE=262144		# face control criterion
 
+# mkimage needs /proc among those, be clear about that
+check_allowed_mountpoints()
+{
+	grep -wqs "^allowed_mountpoints=[^#]*/proc" \
+		/etc/hasher-priv/system \
+		`/usr/libexec/hasher-priv/getconf.sh`
+}
+
 # poor man's SourceIfExists()
 try_source() { [ -f "$1" ] && . "$1"; }
 
@@ -45,7 +55,7 @@ choose_tmpdir() {
 		echo -n "$i "
 		df -PT "$i" | tail -1
 	done \
-	| sort -unk6 \
+	| sort -unk5 \
 	| while read dir dev fstype size used free percent mnt; do
 		check_options "$dev" "$mnt" || continue
 		[ "$free" -gt "$MINSIZE" ] || continue
@@ -59,6 +69,12 @@ choose_tmpdir() {
 }
 
 # bringing it all together
+if ! check_allowed_mountpoints; then
+	echo "error: hasher's allowed_mountpoints do not include /proc;"
+	echo "please check hasher docs and /etc/hasher-priv/system"
+	exit 1
+fi >&2
+
 TMPDIRS="`contemplate_dirs $DIRS`"
 if [ -z "$TMPDIRS" ]; then
 	echo "error: no suitable directories found;"

bin/report-targets

@@ -21,10 +21,10 @@ while read first second third rest; do
 	for to in $TO; do
 		out="  \"$FROM\" -> \"$to\""
 		case $to in
-		*distro/*|*vm/*)
+		*distro/*|*vm/*|*ve/*)
 			echo "$out [weight=10];";;
 		*)
-			echo "$out";;
+			echo "$out;";;
 		esac
 	done
 done

bin/tar2fs

@@ -3,6 +3,7 @@
 # tar2fs chroot.tar image.raw [size_in_bytes [fstype]]
 
 . shell-error
+export LANG=C
 
 if [ $# -lt 2 ]; then
 	fatal "error: tar2fs needs at least two arguments"
@@ -33,7 +34,7 @@ BOOTPART=
 case "`arch`" in	# NB: sudo => no GLOBAL_ will do either; mind qemu-*
 *86*)
 	# NB: different storage modules might be needed for non-kvm
-	INITRD_MODULES="sd_mod ata_piix"
+	INITRD_MODULES="sd_mod ata_piix ahci virtio-scsi virtio-blk"
 	BLOCKDEV="/dev/sda"	# might be /dev/vda for virtio
 	ROOTPART="1"
 	;;
@@ -129,7 +130,7 @@ exit_handler() {
 		umount ${BOOTFS:+"$BOOTFS"} "$ROOTFS"{/dev,/proc,/sys,}
 
 		if [ -n "$LOOPDEV" ]; then
-			kpartx -d "$LOOPDEV"
+			kpartx -d -s "$LOOPDEV"
 			losetup --detach "$LOOPDEV"
 		fi
 		rm -r -- "$ROOTFS"
@@ -202,6 +203,7 @@ if [ -n "$BOOTPART" ]; then
 fi
 
 echo "MODULES_PRELOAD += $INITRD_MODULES $ROOTFSTYPE" >> "$ROOTFS/etc/initrd.mk"
+echo "FEATURES += qemu" >> "$ROOTFS/etc/initrd.mk"
 
 KERNEL="$(readlink $ROOTFS/boot/vmlinuz | sed 's,vmlinuz-,,')"
 chroot "$ROOTFS" make-initrd -k "$KERNEL"
@@ -209,17 +211,17 @@ chroot "$ROOTFS" make-initrd -k "$KERNEL"
 # ...target device too
 sed -i "s,$LOOPROOT,$ROOTDEV," "$ROOTFS/etc/fstab"
 
-if [ -x /sbin/lilo ]; then
+if [ -x "$ROOTFS"/sbin/lilo ]; then
 	# configure and install bootloader
-	REGEXP='^Disk .*: ([0-9]+) cylinders, ([0-9]+) heads, ([0-9]+) sectors/track*$'
-	set -- $(sfdisk -l "$LOOPDEV" | grep -E "$REGEXP" | sed -r "s@$REGEXP@\1 \2 \3@")
+	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 quiet\"
+  append=\"root=$ROOTDEV rootdelay=3 console=tty1 console=ttyS0,115200n8\"
   label=linux"
 
 	cat > "$ROOTFS"/etc/lilo-loop.conf <<-EOF

conf.d/Makefile

@@ -0,0 +1,2 @@
+check:
+	@../bin/check-recipe *.mk

conf.d/README

@@ -29,7 +29,7 @@
 * SYSTEM_PACKAGES стоит применять крайне осторожно -- эти пакеты попадут
   во все стадии, в том числе в образ чувствительной к объёму install2
   (в stage1 -- только в инструментальный чрут); применяйте для того,
-  что обязано быть и в инсталяторе, и в готовой системе
+  что обязано быть и в инсталяторе, и в готовой системе (но не в rescue)
 
 * для направленного действия служат:
 ** STAGE1_PACKAGES, STAGE1_PACKAGES_REGEXP (первая стадия загрузки)
@@ -39,7 +39,7 @@
 ** MAIN_PACKAGES, MAIN_LISTS, MAIN_PACKAGES_REGEXP (дополнительные пакеты)
 ** LIVE_PACKAGES, LIVE_LISTS, LIVE_PACKAGES_REGEXP ("живая" система)
 
-* аналогично по модулям ядра:
+* аналогично по kernel-modules-*:
 ** THE_KMODULES попадут в "пользовательскую" среду (live, main)
 ** STAGE1_KMODULES доступны в производных от stage2 (install2, live, rescue)
 ** BASE_KMODULES попадут в установку по умолчанию

conf.d/basealt.mk

@@ -0,0 +1,72 @@
+ifeq (distro,$(IMAGE_CLASS))
+
+distro/alt-workstation: workstation_groups = $(addprefix workstation/,\
+	10-office 20-networking 30-multimedia 40-virtualization 50-publishing \
+	3rdparty agents blender clamav cloud-clients emulators freecad \
+	ganttproject gnome-peer-to-peer graphics-editing gtk-dictionary \
+	kvm libreoffice mate-usershare pidgin raccess \
+	scanning scribus sound-editing thunderbird virtualbox \
+	vlc voip-clients)
+
+distro/alt-workstation: distro/.base use/luks  \
+	+installer +sysvinit +power +systemd +pulse +vmguest +wireless +efi \
+	use/kernel/net use/docs/license \
+	use/vmguest use/memtest \
+	use/bootloader/grub \
+	use/install2/fs use/install2/vnc use/install2/repo \
+	use/install2/suspend use/x11/xorg use/sound use/xdg-user-dirs \
+	mixin/desktop-installer \
+	use/efi/refind use/efi/shell use/rescue/base \
+	use/branding/complete \
+	use/fonts/install2 use/install2/fs \
+	use/fonts/otf/adobe use/fonts/otf/mozilla \
+	use/fonts/ttf/google/extra use/fonts/ttf/redhat use/fonts/ttf/ubuntu \
+	use/l10n/default/ru_RU \
+	use/control use/services \
+	use/live/install use/live/suspend use/live/x11 use/live/repo \
+	use/live/rw \
+	use/x11/lightdm/gtk use/docs/manual use/x11/gtk/nm +nm \
+	use/fonts/ttf/google use/domain-client/full \
+	use/browser/firefox use/browser/firefox/esr
+	@$(call set,BRANDING,alt-workstation)
+	@$(call add,THE_BRANDING,mate-settings)
+	@$(call set,INSTALLER,altlinux-desktop)
+	@$(call add,INSTALL2_PACKAGES,alterator-notes)
+	@$(call add,INSTALL2_PACKAGES,volumes-profile-regular)
+	@$(call add,INSTALL2_PACKAGES,open-iscsi)
+	@$(call add,COMMON_PACKAGES,vim-console)
+	@$(call add,MAIN_PACKAGES,solaar)
+	@$(call add,MAIN_GROUPS,$(workstation_groups))
+	@$(call add,MAIN_LISTS,workstation/extras)
+	@$(call add,MAIN_LISTS,$(call tags,xorg vaapi))
+	@$(call add,BASE_LISTS,workstation/base.pkgs)
+	@$(call add,BASE_LISTS,$(call tags,desktop cups))
+	@$(call add,LIVE_LISTS,workstation/live.pkgs)
+	@$(call add,LIVE_LISTS,$(call tags,desktop sane))
+	@$(call add,LIVE_LISTS,$(call tags,desktop office))
+	@$(call add,THE_LISTS,workstation/mate)
+	@$(call add,THE_LISTS,workstation/the.pkgs)
+	@$(call add,THE_LISTS,$(call tags,regular desktop))
+	@$(call add,THE_LISTS,$(call tags,base regular))
+	@$(call add,THE_LISTS,$(call tags,base l10n))
+	@$(call add,THE_LISTS,$(call tags,base desktop))
+	@$(call add,THE_LISTS,$(call tags,archive extra))
+	@$(call add,THE_LISTS,$(call tags,mobile mate))
+	@$(call add,THE_KMODULES,staging)
+	@$(call add,BASE_KMODULES,kvm virtualbox)
+	@$(call add,CLEANUP_BASE_PACKAGES,acpid-events-power)
+	@$(call add,CLEANUP_PACKAGES,xterm)
+	@$(call add,EFI_BOOTARGS,lang=ru_RU)
+	@$(call add,RESCUE_BOOTARGS,nomodeset vga=0)
+	@$(call add,CONTROL,xdg-user-dirs:enabled)
+	@$(call add,SERVICES_ENABLE,sshd)
+	@$(call add,SERVICES_ENABLE,cups smb nmb httpd2 bluetoothd libvirtd)
+	@$(call add,DEFAULT_SERVICES_ENABLE,fstrim.timer)
+	@$(call add,DEFAULT_SERVICES_DISABLE,powertop bridge gpm)
+	@$(call set,META_PUBLISHER,BaseALT Ltd)
+	@$(call set,META_VOL_SET,ALT)
+	@$(call set,META_VOL_ID,ALT Workstation)
+	@$(call set,META_APP_ID,8.1/$(ARCH))
+	@$(call set,DOCS,alt-workstation)
+
+endif

conf.d/desktop.mk

@@ -6,8 +6,8 @@ distro/.desktop-base: distro/.installer use/syslinux/ui/vesamenu use/x11/xorg
 
 distro/.desktop-mini: distro/.desktop-base use/x11/xdm +power; @:
 
-mixin/desktop-installer: use/x11-autostart use/sound +net-eth +vmguest
-	@$(call add,SYSTEM_PACKAGES,fonts-ttf-google-croscore-arimo)
+mixin/desktop-installer: +net-eth +vmguest \
+	use/x11-autostart use/fonts/install2 use/sound
 	@$(call add,BASE_LISTS, \
 		$(call tags,(base || desktop) && (l10n || network)))
 	@$(call add,INSTALL2_PACKAGES,ntfs-3g)

conf.d/education.mk

@@ -0,0 +1,12 @@
+# Education Set
+
+ifeq (distro,$(IMAGE_CLASS))
+
+distro/education-junior: distro/.installer use/slinux/full \
+	use/l10n/default/ru_RU +vmguest
+	@$(call set,INSTALLER,junior)
+	@$(call set,BRANDING,school-junior)
+	@$(call set,META_VOL_SET,Education Junior)
+	@$(call add,THE_LISTS,education/desktop)
+
+endif

conf.d/live.mk

@@ -1,11 +1,17 @@
 # live images
 ifeq (distro,$(IMAGE_CLASS))
 
-distro/dos: distro/.init use/dos use/syslinux/ui/menu; @:
+distro/dos: distro/.init use/dos use/syslinux/ui/menu
+	@$(call set,RELNAME,ALT FreeDOS)
 
 distro/rescue: distro/.base use/rescue use/syslinux/ui/menu \
 	use/efi/signed use/efi/refind use/efi/shell; @:
 
+distro/rescue-remote: distro/.base use/rescue/base use/stage2/net-eth
+	@$(call set,SYSLINUX_CFG,rescue_remote)
+	@$(call set,SYSLINUX_DIRECT,1)
+	@$(call add,RESCUE_PACKAGES,livecd-net-eth)
+
 distro/syslinux: distro/.init \
 	use/syslinux/localboot.cfg use/syslinux/ui/vesamenu use/hdt; @:
 
@@ -20,27 +26,23 @@ distro/.live-kiosk: distro/.base use/live/base use/live/autologin \
 	use/syslinux/timeout/1 use/cleanup use/stage2/net-eth \
 	use/fonts/otf/adobe +power
 	@$(call add,CLEANUP_PACKAGES,'alterator*' 'guile*' 'vim-common')
+	@$(call set,SYSLINUX_UI,none)
+	@$(call set,SYSLINUX_CFG,live)
+	@$(call add,STAGE2_BOOTARGS,quiet)
+	@$(call add,DEFAULT_SERVICES_DISABLE,rpcbind klogd syslogd)
+	@$(call add,DEFAULT_SERVICES_DISABLE,consolesaver fbsetfont keytable)
 
-distro/live-builder-mini: distro/.live-base use/dev/mkimage use/dev \
-	use/stage2/net-eth use/net-eth/dhcp use/syslinux/timeout/30 \
-	use/isohybrid
-	@$(call set,KFLAVOURS,$(BIGRAM))
-	@$(call add,LIVE_LISTS,\
-		$(call tags,(base || live) && (server || builder)))
-	@$(call add,LIVE_PACKAGES,livecd-qemu-arch strace)
-	@$(call add,LIVE_PACKAGES,qemu-user-binfmt_misc)
-	@$(call add,LIVE_PACKAGES,zsh sudo)
+distro/live-builder-mini: distro/.live-base use/dev/builder/base \
+	use/syslinux/timeout/30 use/isohybrid \
+	use/stage2/net-eth use/net-eth/dhcp; @:
 
 distro/live-builder: distro/live-builder-mini \
-	use/efi/signed use/live/rw use/live/repo use/dev/repo
-	@$(call add,MAIN_LISTS,$(call tags,live builder))
-	@$(call add,MAIN_PACKAGES,syslinux pciids memtest86+ mkisofs)
+	use/dev/builder/full use/live/rw +efi; @:
 
 distro/live-install: distro/.live-base use/live/textinstall; @:
 distro/.livecd-install: distro/.live-base use/live/install; @:
 
 distro/live-icewm: distro/.live-desktop use/x11/lightdm/gtk +icewm; @:
-distro/live-razorqt: distro/.live-desktop +razorqt; @:
 distro/live-tde: distro/.live-desktop-ru use/live/install +tde; @:
 distro/live-fvwm: distro/.live-desktop-ru use/x11/lightdm/gtk use/x11/fvwm; @:
 
@@ -50,24 +52,26 @@ distro/live-rescue: distro/live-icewm +efi
 		$(call tags,(base || extra) && (archive || rescue || network)))
 
 # NB: this one doesn't include the browser, needs to be chosen downstream
-distro/.live-webkiosk: distro/.live-kiosk use/live/hooks use/live/ru use/sound
+distro/.live-webkiosk: distro/.live-kiosk \
+	use/isohybrid use/live/hooks use/live/ru use/sound \
+	use/stage2/kms use/x11/xorg
 	@$(call add,LIVE_LISTS,$(call tags,live desktop))
 
 distro/.live-webkiosk-gtk: distro/.live-webkiosk
 	@$(call add,CLEANUP_PACKAGES,'libqt4*' 'qt4*')
 
+# kiosk users rather prefer stability to latest bling
 distro/live-webkiosk-mini: distro/.live-webkiosk-gtk \
-	use/fonts/otf/mozilla use/isohybrid
+	use/browser/firefox use/browser/firefox/esr use/fonts/otf/mozilla
 	@$(call add,LIVE_PACKAGES,livecd-webkiosk-firefox)
 
 # NB: flash/java plugins are predictable security holes
 distro/live-webkiosk-flash: distro/live-webkiosk-mini use/plymouth/live \
-	use/browser/plugin/flash use/browser/plugin/java use/efi/signed \
-	+vmguest; @:
+	use/browser/plugin/flash use/browser/plugin/java +vmguest; @:
 
 distro/live-webkiosk: distro/live-webkiosk-mini use/live/desktop; @:
 
-distro/live-webkiosk-chromium: distro/.live-webkiosk use/fonts/ttf/google
+distro/live-webkiosk-chromium: distro/.live-webkiosk use/fonts/ttf/google +efi
 	@$(call add,LIVE_PACKAGES,livecd-webkiosk-chromium)
 
 distro/live-webkiosk-seamonkey: distro/.live-webkiosk use/fonts/ttf/google
@@ -82,22 +86,32 @@ distro/.live-3d: distro/.live-x11 use/x11/3d \
 
 distro/live-glxgears: distro/.live-3d; @:
 
-distro/live-flightgear: distro/.live-kiosk use/x11/3d use/sound \
+distro/.live-games: distro/.live-kiosk use/x11/3d use/sound \
 	use/stage2/net-eth use/net-eth/dhcp use/services +efi +sysvinit
 	@$(call set,KFLAVOURS,un-def)
 	@$(call add,LIVE_LISTS,$(call tags,xorg misc))
-	@$(call add,LIVE_PACKAGES,FlightGear FlightGear-tu154b)
-	@$(call add,LIVE_PACKAGES,fgo input-utils livecd-fgfs)
-	@$(call add,LIVE_PACKAGES,glxgears glxinfo)
+	@$(call add,LIVE_PACKAGES,pciutils input-utils glxgears glxinfo)
 	@$(call add,DEFAULT_SERVICES_DISABLE,rpcbind alteratord messagebus)
 	@$(call add,SERVICES_DISABLE,livecd-net-eth)
+
+distro/live-flightgear: distro/.live-games
+	@$(call add,LIVE_PACKAGES,FlightGear)
+	@$(call add,LIVE_PACKAGES,fgo livecd-fgfs)
 	@$(call try,HOMEPAGE,http://www.4p8.com/eric.brasseur/flight_simulator_tutorial.html)
 
+distro/live-flightgear-tu154: distro/.live-games
+	@$(call add,LIVE_PACKAGES,FlightGear-tu154b)
+
+distro/live-0ad: distro/.live-games
+	@$(call add,STAGE2_BOOTARGS,quiet)
+	@$(call add,LIVE_PACKAGES,0ad livecd-0ad)
+	@$(call try,HOMEPAGE,http://play0ad.com/)
+
 distro/live-e17: distro/.live-desktop-ru use/x11/e17 use/x11/lightdm/gtk; @:
 
 distro/live-gimp: distro/live-icewm use/live/ru
+	@$(call add,LIVE_LISTS,$(call tags,desktop sane))
 	@$(call add,LIVE_PACKAGES,gimp tintii immix fim)
-	@$(call add,LIVE_PACKAGES,sane sane-frontends xsane)
 	@$(call add,LIVE_PACKAGES,darktable geeqie rawstudio ufraw)
 	@$(call add,LIVE_PACKAGES,macrofusion python-module-pygtk-libglade)
 	@$(call add,LIVE_PACKAGES,qtfm openssh-clients rsync usbutils)
@@ -105,4 +119,29 @@ distro/live-gimp: distro/live-icewm use/live/ru
 
 distro/live-robo: distro/live-icewm +robotics use/live/ru; @:
 
+# NB: use/browser won't do as it provides a *single* browser ATM
+distro/live-privacy: distro/.base +power +efi +systemd +vmguest \
+	use/live/base use/live/privacy use/live/ru \
+	use/x11/xorg use/x11/lightdm/gtk use/x11/mate use/x11-autologin \
+	use/browser/firefox/i18n use/sound \
+	use/fonts/otf/adobe use/fonts/otf/mozilla \
+	use/fonts/ttf/google use/fonts/ttf/redhat
+	@$(call set,KFLAVOURS,un-def)
+	@$(call add,LIVE_LISTS,$(call tags,base l10n))
+	@$(call add,LIVE_LISTS,$(call tags,archive extra))
+	@$(call add,LIVE_PACKAGES,chromium gedit mc-full pinta xchm livecd-ru)
+	@$(call add,LIVE_PACKAGES,LibreOffice-langpack-ru java-1.8.0-openjdk)
+	@$(call add,LIVE_PACKAGES,mate-document-viewer-caja)
+	@$(call add,LIVE_PACKAGES,mate-document-viewer-djvu)
+	@$(call add,LIVE_PACKAGES,cups system-config-printer livecd-admin-cups)
+	@$(call add,LIVE_KMODULES,staging)
+	@$(call add,DEFAULT_SERVICES_ENABLE,cups)
+	@$(call add,EFI_BOOTARGS,live_rw)
+
+distro/live-privacy-dev: distro/live-privacy use/live/rw use/live/repo \
+	use/dev/repo use/dev/mkimage use/dev use/control/sudo-su
+	@$(call add,LIVE_LISTS,$(call tags,(base || live) && builder))
+	@$(call add,MAIN_LISTS,$(call tags,live builder))
+	@$(call add,MAIN_PACKAGES,syslinux mkisofs)
+
 endif

conf.d/p7.mk

@@ -1,7 +1,9 @@
 # p7 base kits
 
-mixin/p7:
+mixin/p7: use/browser/firefox/esr
 	@$(call set,BRANDING,altlinux-starterkit)
+	@$(call set,IMAGE_FLAVOUR,$(subst altlinux-p7-,,$(IMAGE_NAME)))
+	@$(call set,META_VOL_ID,ALT Linux p7 $$(IMAGE_FLAVOUR)/$(ARCH))
 
 ifeq (distro,$(IMAGE_CLASS))
 
@@ -16,26 +18,32 @@ distro/altlinux-p7-lxde: distro/regular-lxde mixin/p7; @:
 distro/altlinux-p7-lxqt: distro/regular-lxqt mixin/p7; @:
 distro/altlinux-p7-lxqt-sysv: distro/regular-lxqt-sysv mixin/p7; @:
 distro/altlinux-p7-mate: distro/regular-mate mixin/p7; @:
-distro/altlinux-p7-razorqt: distro/regular-razorqt mixin/p7; @:
 distro/altlinux-p7-rescue: distro/regular-rescue mixin/p7; @:
 distro/altlinux-p7-tde: distro/regular-tde mixin/p7; @:
 distro/altlinux-p7-tde-sysv: distro/regular-tde-sysv mixin/p7; @:
 distro/altlinux-p7-wmaker: distro/regular-wmaker mixin/p7; @:
 distro/altlinux-p7-xfce: distro/regular-xfce mixin/p7; @:
+distro/altlinux-p7-xfce-sysv: distro/regular-xfce-sysv mixin/p7; @:
 
 distro/altlinux-p7-sysv-tde: distro/regular-sysv-tde mixin/p7; @:
 
 distro/altlinux-p7-jeos: distro/regular-jeos mixin/p7; @:
+distro/altlinux-p7-jeos-ovz: distro/regular-jeos-ovz mixin/p7; @:
 distro/altlinux-p7-server: distro/regular-server mixin/p7; @:
 distro/altlinux-p7-server-ovz: distro/regular-server-ovz mixin/p7; @:
 distro/altlinux-p7-server-hyperv: distro/regular-server-hyperv mixin/p7; @:
+distro/altlinux-p7-server-samba4: distro/regular-server-samba4 mixin/p7; @:
+
+distro/altlinux-p7-builder: distro/regular-builder mixin/p7; @:
 
 endif
 
 ifeq (ve,$(IMAGE_CLASS))
 ve/altlinux-p7-ovz-generic: ve/generic mixin/p7; @:
+ve/altlinux-p7-ovz-pgsql94: ve/pgsql94 mixin/p7; @:
 endif
 
 ifeq (vm,$(IMAGE_CLASS))
 vm/altlinux-p7-vm-net: vm/net mixin/p7; @:
+vm/altlinux-p7-vagrant: vm/vagrant-base mixin/p7; @:
 endif

conf.d/p8.mk

@@ -0,0 +1,50 @@
+# p8 base kits
+
+mixin/p8: use/browser/firefox/esr
+	@$(call set,BRANDING,alt-starterkit)
+	@$(call set,IMAGE_FLAVOUR,$(subst alt-p8-,,$(IMAGE_NAME)))
+	@$(call set,META_VOL_ID,ALT p8 $$(IMAGE_FLAVOUR)/$(ARCH))
+
+ifeq (distro,$(IMAGE_CLASS))
+
+distro/alt-p8-cinnamon: distro/regular-cinnamon mixin/p8; @:
+distro/alt-p8-icewm: distro/regular-icewm mixin/p8; @:
+distro/alt-p8-gnome3: distro/regular-gnome3 mixin/p8; @:
+distro/alt-p8-gnustep: distro/regular-gnustep mixin/p8; @:
+distro/alt-p8-kde4: distro/regular-kde4 mixin/p8; @:
+distro/alt-p8-kde5: distro/regular-kde5 mixin/p8; @:
+distro/alt-p8-lxde: distro/regular-lxde mixin/p8; @:
+distro/alt-p8-lxqt: distro/regular-lxqt mixin/p8; @:
+distro/alt-p8-lxqt-sysv: distro/regular-lxqt-sysv mixin/p8; @:
+distro/alt-p8-mate: distro/regular-mate mixin/p8; @:
+distro/alt-p8-rescue: distro/regular-rescue mixin/p8; @:
+distro/alt-p8-tde: distro/regular-tde mixin/p8; @:
+distro/alt-p8-tde-sysv: distro/regular-tde-sysv mixin/p8; @:
+distro/alt-p8-wmaker: distro/regular-wmaker mixin/p8; @:
+distro/alt-p8-xfce: distro/regular-xfce mixin/p8; @:
+distro/alt-p8-xfce-sysv: distro/regular-xfce-sysv mixin/p8; @:
+distro/alt-p8-enlightenment: distro/regular-enlightenment mixin/p8; @:
+distro/alt-p8-sysv-tde: distro/regular-sysv-tde mixin/p8; @:
+distro/alt-p8-sysv-xfce: distro/regular-sysv-xfce mixin/p8; @:
+
+distro/alt-p8-jeos: distro/regular-jeos mixin/p8; @:
+distro/alt-p8-jeos-ovz: distro/regular-jeos-ovz mixin/p8; @:
+distro/alt-p8-server: distro/regular-server mixin/p8; @:
+distro/alt-p8-server-ovz: distro/regular-server-ovz mixin/p8; @:
+distro/alt-p8-server-hyperv: distro/regular-server-hyperv mixin/p8; @:
+distro/alt-p8-server-samba4: distro/regular-server-samba4 mixin/p8; @:
+distro/alt-p8-server-openstack: distro/regular-server-openstack mixin/p8; @:
+distro/alt-p8-server-pve: distro/regular-server-pve mixin/p8; @:
+
+distro/alt-p8-builder: distro/regular-builder mixin/p8; @:
+
+endif
+
+ifeq (ve,$(IMAGE_CLASS))
+ve/alt-p8-ovz-generic: ve/generic mixin/p8; @:
+endif
+
+ifeq (vm,$(IMAGE_CLASS))
+vm/alt-p8-vm-net: vm/net mixin/p8; @:
+vm/alt-p8-cloud: vm/cloud-systemd mixin/p8; @:
+endif

conf.d/regular.mk

@@ -1,116 +1,155 @@
 # regular build/usage images
 ifeq (distro,$(IMAGE_CLASS))
 
-# common ground
-distro/.regular-bare: distro/.base +wireless +net-eth \
-	use/efi/signed use/memtest use/kernel/net
+# common ground (really lowlevel)
+distro/.regular-bare: distro/.base +net-eth use/kernel/net use/docs/license
 	@$(call try,SAVE_PROFILE,yes)
 
+# base target (for most images)
+distro/.regular-base: distro/.regular-bare use/vmguest use/memtest +efi; @:
+
 # graphical target (not enforcing xorg drivers or blobs)
-distro/.regular-x11: distro/.regular-bare use/x11/wacom +vmguest \
-	use/live/x11 use/live/install use/live/repo use/live/rw \
-	use/luks use/branding use/browser/firefox/live use/browser/firefox/i18n
+distro/.regular-x11: distro/.regular-base +vmguest +wireless \
+	use/live/x11 use/live/install use/live/suspend \
+	use/live/repo use/live/rw use/luks use/x11/wacom use/ntp/client \
+	use/branding use/browser/firefox/live use/browser/firefox/i18n \
+	use/browser/firefox/h264
+	@$(call add,LIVE_PACKAGES,volumes-profile-regular)
 	@$(call add,LIVE_LISTS,$(call tags,(base || desktop) && regular))
 	@$(call add,LIVE_LISTS,$(call tags,base rescue))
 	@$(call add,LIVE_PACKAGES,gpm livecd-install-apt-cache)
-	@$(call add,DEFAULT_SERVICES_ENABLE,gpm)
+	@$(call add,DEFAULT_SERVICES_DISABLE,gpm powertop lvm2-lvmpolld)
+	@$(call add,EFI_BOOTARGS,live_rw)
 
 # common WM live/installer bits
 mixin/regular-desktop: use/x11/xorg use/sound use/xdg-user-dirs
 	@$(call add,THE_PACKAGES,installer-feature-desktop-other-fs-stage2)
-	@$(call add,THE_PACKAGES,alterator-notes)
+	@$(call add,THE_PACKAGES,alterator-notes dvd+rw-tools)
 	@$(call add,THE_BRANDING,alterator graphics indexhtml notes)
+	@$(call add,THE_PACKAGES,$$(THE_IMAGEWRITER))
+	@$(call set,THE_IMAGEWRITER,imagewriter)
 
 # WM base target
-distro/.regular-base: distro/.regular-x11 mixin/regular-desktop
+distro/.regular-wm: distro/.regular-x11 mixin/regular-desktop; @:
 
 # DE base target
 # TODO: use/plymouth/live when luks+plymouth is done, see also #28255
-distro/.regular-desktop: distro/.regular-base \
+distro/.regular-desktop: distro/.regular-wm \
 	use/syslinux/ui/gfxboot use/firmware/laptop use/efi/refind +systemd
 	@$(call add,LIVE_LISTS,domain-client)
 	@$(call add,THE_BRANDING,bootloader)
+	@$(call add,THE_PACKAGES,upower bluez)
+	@$(call add,THE_PACKAGES,disable-usb-autosuspend)
+	@$(call add,THE_PACKAGES,systemd-udev-console-fb)	#28805
 	@$(call add,DEFAULT_SERVICES_DISABLE,gssd idmapd krb5kdc rpcbind)
+	@$(call add,DEFAULT_SERVICES_ENABLE,bluetoothd)
 	@$(call set,KFLAVOURS,std-def)
 
 distro/.regular-gtk: distro/.regular-desktop use/x11/lightdm/gtk +plymouth; @:
-distro/.regular-sysv: distro/.regular-base +sysvinit; @:
+distro/.regular-sysv: distro/.regular-wm +sysvinit; @:
 distro/.regular-sysv-gtk: distro/.regular-sysv use/syslinux/ui/gfxboot \
 	use/x11/gdm2.20; @:
 
-distro/.regular-install: distro/.regular-bare +installer +sysvinit +power \
+distro/.regular-install: distro/.regular-base +installer +sysvinit +power \
 	use/branding use/bootloader/grub use/luks \
 	use/install2/fs use/install2/vnc use/install2/repo
 	@$(call add,THE_LISTS,$(call tags,base regular))
 	@$(call add,INSTALL2_BRANDING,alterator notes)
 	@$(call add,THE_BRANDING,alterator)
 
-# NB:
-# - no +power or even use/power/acpi/button on intent
-# - stock cleanup is not enough (or installer-common-stage3 deps soaring)
-distro/regular-jeos: distro/.base use/isohybrid +sysvinit +net-eth \
-	use/install2/packages use/install2/vmguest use/vmguest/base \
+# common base for the very bare distros
+distro/.regular-jeos: distro/.regular-bare use/isohybrid +sysvinit \
 	use/branding use/bootloader/lilo use/syslinux/lateboot.cfg \
+	use/install2/repo use/install2/packages \
 	use/install2/cleanup/everything use/install2/cleanup/kernel/everything \
-	use/cleanup/x11-alterator use/net use/kernel/net use/power/acpi/button
-	@$(call set,KFLAVOURS,led-ws)	# led-vs might be nice here
+	use/cleanup/jeos use/net/etcnet use/power/acpi/button
+	@$(call add,STAGE2_BOOTARGS,vga=0)
 	@$(call add,BASE_KMODULES,guest scsi vboxguest)
+	@$(call add,BASE_PACKAGES,make-initrd-mdadm cpio)
 	@$(call set,INSTALLER,altlinux-generic)
 	@$(call add,INSTALL2_BRANDING,alterator notes)
 	@$(call add,THE_BRANDING,alterator) # just to be cleaned up later on
-	@$(call add,THE_PACKAGES,apt basesystem dhcpcd openssh vim-console)
-	@# a *lot* of stray things get pulled in by alterator modules
-	@$(call add,CLEANUP_PACKAGES,libICE 'libX*' libxcb libfreetype)
-	@$(call add,CLEANUP_PACKAGES,fontconfig 'glib2*' libffi 'libltdl*')
-	@$(call add,CLEANUP_PACKAGES,liblcms libjpeg 'libpng*' 'libtiff*')
-	@$(call add,CLEANUP_PACKAGES,avahi-autoipd bridge-utils) # i-c-stage3
-	@$(call add,CLEANUP_PACKAGES,iw wpa_supplicant)
-	@$(call add,CLEANUP_PACKAGES,openssl libpcsclite)
-	@# fully fledged interactivesystem isn't needed here either
-	@$(call add,CLEANUP_PACKAGES,interactivesystem 'groff*' man stmpclean)
-	@$(call add,CLEANUP_PACKAGES,glibc-gconv-modules gettext)
-	@$(call add,CLEANUP_PACKAGES,console-scripts console-vt-tools 'kbd*')
-	@$(call add,CLEANUP_PACKAGES,libsystemd-journal libsystemd-login)
-	@$(call add,CLEANUP_PACKAGES,dbus libdbus libcap-ng)
+	@$(call add,THE_PACKAGES,apt basesystem dhcpcd vim-console)
+	@$(call add,THE_LISTS,openssh)
+
+# NB:
+# - stock cleanup is not enough (or installer-common-stage3 deps soaring)
+distro/regular-jeos: distro/.regular-jeos use/cleanup/jeos/full \
+	use/install2/vmguest use/vmguest/base
+	@$(call add,MAIN_PACKAGES,firmware-linux)
+	@$(call add,INSTALL2_PACKAGES,volumes-profile-jeos)
+	@$(call add,CLEANUP_PACKAGES,'glib2*' libffi 'libltdl*')
+	@$(call add,CLEANUP_PACKAGES,bridge-utils)
+	@$(call add,STAGE2_BOOTARGS,quiet)
+	@$(call set,KFLAVOURS,un-def)
+
+# NB: no +efi as it brings in grub2 (no ELILO support for system boot)
+distro/regular-jeos-ovz: distro/.regular-jeos \
+	use/server/ovz-base use/control/server/ldv use/firmware
+	@$(call add,THE_PACKAGES,ipmitool lm_sensors3 mailx)
 
 distro/.regular-install-x11: distro/.regular-install \
-	mixin/regular-desktop +vmguest
+	use/install2/suspend mixin/regular-desktop +vmguest +wireless
 	@$(call set,INSTALLER,altlinux-desktop)
 	@$(call add,THE_LISTS,$(call tags,regular desktop))
 
-distro/regular-icewm: distro/.regular-sysv-gtk +icewm \
-	use/browser/seamonkey/i18n use/fonts/ttf/redhat
+# assumes somewhat more experienced user, mostly for sysv variants
+distro/.regular-install-x11-full: distro/.regular-install-x11 \
+	mixin/desktop-installer mixin/regular-desktop use/install2/fs \
+	use/fonts/otf/adobe use/fonts/otf/mozilla \
+	use/branding/complete use/branding/slideshow/once \
+	use/net-eth/dhcp use/efi/refind use/efi/shell use/rescue/base
+	@$(call add,RESCUE_LISTS,$(call tags,rescue misc))
+	@$(call add,MAIN_PACKAGES,anacron man-whatis usb-modeswitch)
+
+distro/regular-icewm: distro/.regular-sysv-gtk +icewm +nm \
+	use/x11/lightdm/gtk use/init/sysv/polkit use/deflogin/sysv/nm \
+	use/browser/chromium use/fonts/ttf/redhat
+	@$(call add,LIVE_LISTS,$(call tags,desktop nm))
 	@$(call add,LIVE_LISTS,$(call tags,regular icewm))
-	@$(call add,LIVE_PACKAGES,gparted mnt)
+	@$(call add,LIVE_PACKAGES,mnt winswitch xpra)
+	@$(call add,LIVE_PACKAGES,icewm-startup-networkmanager)
 	@$(call set,KFLAVOURS,un-def)
 
-mixin/regular-wmaker: use/efi/refind use/syslinux/ui/gfxboot use/x11/wmaker
+mixin/regular-wmaker: use/efi/refind use/syslinux/ui/gfxboot \
+	use/fonts/ttf/redhat use/x11/wmaker
 	@$(call add,LIVE_PACKAGES,livecd-install-wmaker)
 	@$(call add,LIVE_PACKAGES,installer-feature-no-xconsole-stage3)
 	@$(call add,MAIN_PACKAGES,wmgtemp wmhdaps wmpomme wmxkbru xxkb)
 
 # wdm can't do autologin so add standalone one for livecd
 distro/regular-wmaker: distro/.regular-sysv \
-	mixin/regular-wmaker use/live/autologin use/browser/seamonkey/i18n
-	@$(call add,LIVE_PACKAGES,wdm)
-	@$(call set,KFLAVOURS,led-ws)
+	mixin/regular-wmaker use/live/autologin use/browser/palemoon/i18n
+	@$(call add,LIVE_PACKAGES,wdm wmxkbru)
 
 # gdm2.20 can reboot/halt with both sysvinit and systemd, and is slim
 mixin/regular-gnustep: use/x11/gnustep use/x11/gdm2.20 use/mediacheck \
-	use/browser/firefox/classic +plymouth
+	use/browser/firefox/classic
 	@$(call add,THE_BRANDING,graphics)
 
 distro/regular-gnustep: distro/.regular-sysv \
 	mixin/regular-wmaker mixin/regular-gnustep; @:
-distro/regular-gnustep-systemd: distro/.regular-base +systemd \
+distro/regular-gnustep-systemd: distro/.regular-wm +systemd \
 	mixin/regular-wmaker mixin/regular-gnustep; @:
 
-distro/regular-xfce: distro/.regular-gtk \
-	use/x11/xfce use/domain-client/full use/browser/firefox/classic \
-	use/x11/gtk/nm +nm; @:
+mixin/regular-xfce: use/x11/xfce use/fonts/ttf/redhat use/x11/gtk/nm +nm; @:
+
+distro/regular-xfce: distro/.regular-gtk mixin/regular-xfce \
+	use/x11/xfce/full use/domain-client/full
+	@$(call set,KFLAVOURS,un-def)
+
+mixin/regular-xfce-sysv: use/init/sysv/polkit use/deflogin/sysv/nm \
+	use/x11/lightdm/gtk \
+	use/browser/firefox use/browser/firefox/classic \
+	use/browser/firefox/i18n use/browser/firefox/h264 \
+	use/fonts/otf/adobe use/fonts/otf/mozilla
+	@$(call add,THE_PACKAGES,xfce4-mixer pm-utils elinks mpg123)
+
+distro/regular-xfce-sysv: distro/.regular-sysv-gtk \
+	mixin/regular-xfce mixin/regular-xfce-sysv; @:
 
 distro/regular-lxde: distro/.regular-gtk use/x11/lxde use/fonts/infinality \
-	use/x11/gtk/nm +nm
+	use/x11/gtk/nm use/im +nm
 	@$(call add,LIVE_LISTS,$(call tags,desktop gvfs))
 
 distro/regular-xmonad: distro/.regular-gtk use/x11/xmonad
@@ -119,29 +158,38 @@ distro/regular-xmonad: distro/.regular-gtk use/x11/xmonad
 distro/regular-mate: distro/.regular-gtk +nm \
 	use/x11/mate use/fonts/ttf/google use/domain-client/full
 	@$(call add,LIVE_LISTS,$(call tags,mobile mate))
+	@$(call add,LIVE_LISTS,$(call tags,desktop sane))
 
 distro/regular-e17: distro/.regular-gtk use/x11/e17 use/fonts/infinality; @:
-distro/regular-e19: distro/.regular-gtk use/x11/e19 use/fonts/infinality; @:
-distro/regular-e19-sysv: distro/.regular-sysv-gtk use/x11/e19; @:
+
+distro/regular-enlightenment: distro/.regular-gtk \
+	use/x11/enlightenment use/fonts/infinality; @:
+
+distro/regular-enlightenment-sysv: distro/.regular-sysv-gtk \
+	use/x11/enlightenment
+	@$(call set,META_VOL_ID,ALT regular-E-SysV/$(ARCH)) # see also #28271
 
 distro/regular-cinnamon: distro/.regular-gtk \
-	use/x11/cinnamon use/fonts/infinality use/net/nm/mmgui
-	@$(call set,META_VOL_ID,ALT Linux $(IMAGE_NAME)) # see also #28271
-	@$(call set,KFLAVOURS,un-def)
+	use/x11/cinnamon use/fonts/infinality use/fonts/ttf/google \
+	use/net/nm/mmgui use/im; @:
 
 # not .regular-gtk due to gdm vs lightdm
-distro/regular-gnome3: distro/.regular-desktop \
-	use/x11/gnome3 use/browser/epiphany +plymouth +nm
-	@$(call add,LIVE_PACKAGES,livecd-gnome3-nosetup)
+distro/regular-gnome3: distro/.regular-desktop +plymouth +nm \
+	use/x11/gnome3 use/browser/epiphany use/fonts/ttf/redhat
+	@$(call set,KFLAVOURS,un-def)
+	@$(call add,LIVE_PACKAGES,livecd-gnome3-setup-done)
+	@$(call add,LIVE_PACKAGES,gnome3-regular xcalib templates)
+	@$(call add,LIVE_PACKAGES,gnome-flashback)
 
 # reusable bits
-mixin/regular-tde: use/syslinux/ui/gfxboot use/browser/firefox/classic \
-	+tde +plymouth
+mixin/regular-tde: +tde \
+	use/syslinux/ui/gfxboot use/browser/firefox/classic use/fonts/ttf/redhat
 	@$(call add,THE_PACKAGES,kdeedu)
-	@$(call add,THE_LISTS,openscada)
+	@$(call add,DEFAULT_SERVICES_DISABLE,upower bluetoothd)
 
-distro/regular-tde: distro/.regular-desktop mixin/regular-tde \
-	use/x11/gtk/nm use/net/nm/mmgui; @:
+distro/regular-tde: distro/.regular-desktop mixin/regular-tde +plymouth \
+	use/x11/gtk/nm use/net/nm/mmgui
+	@$(call add,THE_LISTS,openscada)
 
 distro/regular-tde-sysv: distro/.regular-sysv mixin/regular-tde \
 	use/net-eth/dhcp use/efi/refind; @:
@@ -149,59 +197,123 @@ distro/regular-tde-sysv: distro/.regular-sysv mixin/regular-tde \
 distro/regular-kde4: distro/.regular-desktop use/x11/kde4/nm use/x11/kdm4 \
 	use/browser/konqueror4 use/fonts/zerg use/domain-client/full \
 	use/net/nm/mmgui +pulse +plymouth
-	@$(call add,LIVE_LISTS,$(call tags,regular kde4))
-	@$(call add,LIVE_PACKAGES,rosa-imagewriter)
+	@$(call add,THE_LISTS,$(call tags,regular kde4))
+	@$(call add,THE_PACKAGES,fonts-ttf-levien-inconsolata)
+	@$(call set,THE_IMAGEWRITER,rosa-imagewriter)
 	@$(call add,DEFAULT_SERVICES_ENABLE,prefdm)
 
-distro/regular-razorqt: distro/.regular-desktop +razorqt +plymouth; @:
+mixin/regular-lxqt: use/x11/lxqt use/x11/sddm \
+	use/browser/qupzilla use/x11/gtk/nm +nm +plymouth
+	@$(call set,THE_IMAGEWRITER,rosa-imagewriter)
 
-mixin/regular-lxqt: use/x11/lxqt use/x11/lightdm/lxqt \
-	use/browser/qupzilla +plymouth; @:
-
-distro/regular-lxqt: distro/.regular-desktop mixin/regular-lxqt +nm; @:
+distro/regular-lxqt: distro/.regular-desktop mixin/regular-lxqt; @:
 
 distro/regular-lxqt-sysv: distro/.regular-sysv mixin/regular-lxqt \
 	use/net-eth/dhcp use/efi/refind; @:
 
 distro/regular-sugar: distro/.regular-gtk use/x11/sugar; @:
 
+distro/regular-leechcraft: distro/.regular-desktop \
+	use/x11/leechcraft use/x11/lightdm/lxqt +pulse; @:
+
+distro/regular-kde5: distro/.regular-desktop \
+	use/x11/kde5 use/x11/sddm \
+	use/fonts/ttf/google use/fonts/ttf/redhat use/fonts/zerg \
+	+nm +pulse +plymouth
+	@$(call add,THE_PACKAGES,kde5-telepathy)
+	@$(call set,THE_IMAGEWRITER,rosa-imagewriter)
+
 # NB: never ever use/syslinux/ui/gfxboot here as gfxboot mangles
 #     kernel cmdline resulting in method:disk instead of method:cdrom
 #     which will change propagator's behaviour to probe additional
 #     filesystems (ro but no loop) thus potentially writing to
 #     an unrecovered filesystem's journal
-distro/regular-rescue: distro/.regular-bare use/rescue/rw use/luks \
+distro/regular-rescue: distro/.regular-base use/rescue/rw use/luks \
 	use/branding use/efi/refind use/efi/shell use/efi/memtest86 \
-	use/hdt use/syslinux/ui/menu use/syslinux/rescue_fm.cfg \
-	use/syslinux/timeout/200 use/mediacheck test/rescue/no-x11
+	use/hdt use/syslinux/ui/menu use/syslinux/timeout/600 \
+	use/syslinux/rescue_fm.cfg use/syslinux/rescue_remote.cfg \
+	use/firmware/qlogic use/mediacheck test/rescue/no-x11 \
+	+wireless +sysvinit
 	@$(call set,KFLAVOURS,un-def)
-	@$(call add,RESCUE_PACKAGES,gpm)
+	@$(call add,RESCUE_PACKAGES,gpm livecd-net-eth)
+	@$(call add,RESCUE_LISTS,$(call tags,base && (smartcard || bench)))
+	@$(call add,RESCUE_LISTS,$(call tags,network security))
 
-distro/regular-sysv-tde: distro/.regular-install-x11 \
-	mixin/desktop-installer mixin/regular-tde \
-	use/branding/complete use/branding/slideshow/once \
-	use/net-eth/dhcp use/efi/refind use/efi/shell use/rescue/base \
-	use/fonts/otf/adobe use/fonts/otf/mozilla
-	@$(call set,KFLAVOURS,led-ws)
-	@$(call add,RESCUE_LISTS,$(call tags,rescue misc))
+distro/regular-sysv-tde: distro/.regular-install-x11-full mixin/regular-tde
 	@$(call add,THE_LISTS,$(call tags,base desktop))
 	@$(call add,THE_LISTS,$(call tags,regular tde))
-	@$(call add,MAIN_PACKAGES,man-whatis usb-modeswitch)
+	@$(call add,THE_PACKAGES,kpowersave)
 
-distro/regular-server: distro/.regular-install use/server/mini use/rescue/base
+distro/regular-sysv-xfce: distro/.regular-install-x11-full \
+	mixin/regular-xfce mixin/regular-xfce-sysv; @:
+
+distro/.regular-server-base: distro/.regular-install \
+	use/server/base use/stage2/kms
 	@$(call add,THE_LISTS,$(call tags,regular server))
-	@$(call add,MAIN_PACKAGES,aptitude)
 	@$(call set,INSTALLER,altlinux-server)
+	@$(call add,SYSTEM_PACKAGES,multipath-tools)
+	@$(call add,INSTALL2_PACKAGES,installer-feature-multipath)
 
-distro/regular-server-ovz: distro/regular-server \
-	use/server/ovz use/server/groups/base; @:
+distro/.regular-server: distro/.regular-server-base \
+	use/server/mini use/firmware/qlogic use/rescue/base use/cleanup/libs
+	@$(call add,MAIN_PACKAGES,aptitude)
+	@$(call add,CLEANUP_PACKAGES,qt4-common)
+	@$(call add,DEFAULT_SERVICES_DISABLE,bridge)
 
-distro/regular-server-hyperv: distro/regular-server
-	@$(call set,KFLAVOURS,un-def)
-	@$(call add,THE_PACKAGES,hyperv-daemons)
+distro/.regular-server-managed: distro/.regular-server
 	@$(call add,THE_PACKAGES,alterator-fbi)
 	@$(call add,THE_LISTS,$(call tags,server alterator))
+	@$(call add,INSTALL2_PACKAGES,ntfs-3g)
 	@$(call add,DEFAULT_SERVICES_DISABLE,ahttpd alteratord)
-	@$(call add,DEFAULT_SERVICES_DISABLE,bridge cpufreq-simple)
+
+distro/regular-server: distro/.regular-server-managed use/server/groups/base
+	@$(call add,MAIN_GROUPS,server/sambaDC)
+	@$(call add,MAIN_GROUPS,tools/hyperv)
+
+distro/regular-server-ovz: distro/.regular-server \
+	use/server/ovz use/server/groups/tools use/cleanup/x11-alterator
+	@$(call add,MAIN_GROUPS,tools/vzstats)
+
+distro/regular-server-hyperv: distro/.regular-server-managed
+	@$(call set,KFLAVOURS,un-def)
+	@$(call add,THE_PACKAGES,hyperv-daemons)
+	@$(call add,DEFAULT_SERVICES_DISABLE,bridge smartd)
+	@$(call add,DEFAULT_SERVICES_DISABLE,cpufreq-simple powertop)
+
+distro/.regular-server-openstack: distro/.regular-server-base \
+	use/firmware/qlogic use/server/groups/openstack
+	@$(call add,MAIN_GROUPS,tools/ipmi tools/monitoring)
+
+distro/regular-server-openstack: distro/.regular-server-openstack +systemd; @:
+
+distro/regular-server-openstack-sysv: distro/.regular-server-openstack +sysvinit
+	@$(call add,DEFAULT_SERVICES_DISABLE,lvm2-lvmetad)
+
+distro/regular-server-pve: distro/.regular-server-base \
+	use/firmware/qlogic +efi +systemd
+	@$(call set,BASE_BOOTLOADER,grub)
+	@$(call set,INSTALLER,altlinux-server)
+	@$(call add,INSTALL2_PACKAGES,installer-feature-pve)
+	@$(call add,THE_PACKAGES,pve-manager nfs-clients su)
+	@$(call add,THE_PACKAGES,bridge-utils dhcpcd faketime tzdata postfix)
+	@$(call add,THE_KMODULES,ipset kvm)
+	@$(call add,DEFAULT_SERVICES_DISABLE,pve-manager pve-cluster \
+		pve-firewall pve-ha-crm pve-manager pveproxy pvedaemon \
+		pvefw-logger pve-ha-lrm pvenetcommit pvestatd spiceproxy)
+
+distro/regular-builder: distro/.regular-bare \
+	use/dev/builder/full +sysvinit +efi +power \
+	use/live/base use/live/rw use/live/repo/online use/live/textinstall \
+	use/isohybrid use/syslinux/timeout/30 \
+	use/stage2/net-eth use/net-eth/dhcp
+	@$(call add,LIVE_PACKAGES,cifs-utils elinks lftp openssh wget)
+	@$(call add,LIVE_PACKAGES,bash-completion gpm screen tmux zsh)
+	@$(call add,LIVE_PACKAGES,ccache rpm-utils wodim)
+	@$(call add,DEFAULT_SERVICES_ENABLE,gpm)
+
+distro/regular-server-samba4: distro/regular-server
+	@$(call add,THE_LISTS,$(call tags,server && (sambaDC || alterator)))
+	@$(call add,THE_PACKAGES,alterator-fbi alterator-dhcp)
+	@$(call add,DEFAULT_SERVICES_DISABLE,smbd nmbd winbind)
 
 endif

conf.d/server.mk

@@ -15,6 +15,11 @@ distro/server-mini: distro/.server-base +net-eth \
 	@$(call set,INSTALLER,altlinux-server)
 	@$(call add,BASE_PACKAGES,make-initrd-mdadm make-initrd-lvm)
 
+distro/server-mini-systemd-networkd: distro/.server-base \
+	use/net/networkd +systemd \
+	use/server/mini use/efi use/firmware
+	@$(call set,INSTALLER,altlinux-server)
+
 distro/server-ovz: distro/server-mini use/server/ovz use/server/groups/base \
 	use/install2/net use/hdt use/rescue \
 	use/firmware/server use/firmware/cpu +wireless; @:

conf.d/simply.mk

@@ -3,7 +3,7 @@
 ifeq (distro,$(IMAGE_CLASS))
 
 distro/live-simply: distro/.livecd-install use/slinux/full
-	@$(call add,THE_LISTS,slinux/live-install)
+	@$(call add,THE_LISTS,slinux/live-install slinux/live)
 
 distro/simply: distro/.installer use/slinux/full
 	@$(call set,INSTALLER,simply-linux)

conf.d/test.mk

@@ -8,7 +8,7 @@ distro/syslinux-noescape: distro/syslinux-auto use/syslinux/noescape.cfg; @:
 
 distro/live-systemd: distro/.base use/live/base +systemd; @:
 distro/live-plymouth: distro/.live-base use/plymouth/live; @:
-distro/live-mediacheck: distro/.base use/mediacheck; @:
+distro/live-mediacheck: distro/.base use/mediacheck +plymouth; @:
 
 distro/live-testserver: distro/live-install use/server/mini
 	@$(call set,KFLAVOURS,std-def el-smp)
@@ -25,12 +25,14 @@ distro/live-zabbix: distro/live-icewm use/net-eth
 distro/icewm-efi: distro/icewm use/efi/debug use/firmware
 	@$(call add,INSTALL2_PACKAGES,strace)
 
-distro/razorqt-kz: distro/regular-razorqt
+distro/mate-kz: distro/regular-mate
 	@$(call set,GLOBAL_BOOT_LANG,kk_KZ)
 	@$(call add,LIVE_PACKAGES,hunspell-kk)
 
-distro/server-systemd: distro/server-mini +systemd
-	@$(call set,KFLAVOURS,std-def)
+# a minimalistic systemd-based server installer
+distro/server-systemd: distro/server-nano \
+	use/install2/repo use/cleanup/x11-alterator use/net/networkd +systemd
+	@$(call add,CLEANUP_PACKAGES,glib2 iw libpython libwireless)
 
 distro/server-test: distro/server-mini use/relname
 	@$(call set,RELNAME,Test-Server)
@@ -39,10 +41,8 @@ distro/server-test: distro/server-mini use/relname
 # NB: doesn't carry stage3 thus cannot use/bootloader
 distro/netinst: distro/.base use/install2/net; @:
 
-# tiny network-only server-ovz installer (stage2 comes over net too)
-distro/server-ovz-netinst: distro/.base sub/stage1 use/stage2 \
-	use/syslinux/ui/menu use/syslinux/localboot.cfg use/memtest
-	@$(call add,SYSLINUX_CFG,netinstall2)
+distro/propagator-test: distro/.base use/mediacheck
+	@$(call add,STAGE2_BOOTARGS,propagator-debug)
 
 distro/desktop-luks: distro/icewm use/luks; @:
 distro/desktop-systemd: distro/icewm +systemd; @:

conf.d/ve.mk

@@ -1,14 +1,14 @@
 ifeq (ve,$(IMAGE_CLASS))
 
 # no "vzctl enter"
-ve/bare: ve/.base use/init/sysv; @:
+ve/bare: ve/.base +sysvinit; @:
 
 # /dev/pty and friends start here
 ve/base: ve/bare
 	@$(call add,BASE_PACKAGES,interactivesystem)
 
 # a particular package list
-ve/ldv: ve/bare
+ve/ldv: ve/bare use/control/server/ldv
 	@$(call add,BASE_PACKAGES,xz bzip2 glibc hostinfo less)
 	@$(call add,BASE_PACKAGES,vim-console netlist rsync time)
 	@$(call add,BASE_PACKAGES,openssh-blacklist openssh-server)
@@ -16,6 +16,14 @@ ve/ldv: ve/bare
 
 ve/docker: ve/.base use/repo; @:
 
+# build environment
+ve/builder: ve/base use/repo
+	@$(call add,BASE_PACKAGES,vim-console git-core bash-completion zsh)
+	@$(call add,BASE_PACKAGES,su hasher mkimage-profiles rpm-build)
+	@$(call add,BASE_PACKAGES,rsync screen parallel pv)
+	@$(call add,BASE_PACKAGES,fdisk e2fsprogs iproute2 net-tools)
+	@$(call add,BASE_LISTS,openssh)
+
 # this should be more or less convenient
 ve/generic: ve/base use/repo
 	@$(call add,BASE_PACKAGES,vim-console etckeeper)
@@ -26,4 +34,11 @@ ve/generic: ve/base use/repo
 ve/openvpn: ve/bare
 	@$(call add,BASE_LISTS,$(call tags,server openvpn))
 
+ve/pgsql94: ve/generic
+	@$(call add,BASE_PACKAGES,postgresql9.4-server)
+
+ve/systemd-bare: ve/.base use/control/sudo-su use/repo use/net/networkd +systemd
+	@$(call add,BASE_PACKAGES,interactivesystem su)
+	@$(call add,BASE_LISTS,openssh)
+
 endif

conf.d/vm.mk

@@ -5,9 +5,30 @@ ifeq (vm,$(IMAGE_CLASS))
 vm/bare: vm/.bare +sysvinit
 	@$(call add,BASE_PACKAGES,apt)
 
-vm/net: vm/bare use/net-eth/dhcp use/net-ssh use/repo use/control/sudo-su
+vm/systemd: vm/.bare +systemd
+	@$(call add,BASE_PACKAGES,apt)
+
+# handle ROOTPW (through deflogin)
+vm/net: vm/bare use/net-eth/dhcp use/net-ssh \
+	use/repo use/control/sudo-su use/deflogin
 	@$(call add,BASE_PACKAGES,su)
 
+vm/systemd-net: vm/systemd use/net-eth/networkd-dhcp use/net-ssh \
+	use/repo use/control/sudo-su use/deflogin
+	@$(call add,BASE_PACKAGES,su)
+
+# vm/net or vm/systemd-net
+vm/cloud-systemd: vm/systemd-net use/vmguest/kvm
+	@$(call add,BASE_PACKAGES,cloud-init)
+	@$(call add,DEFAULT_SERVICES_ENABLE,cloud-config cloud-final cloud-init cloud-init-local)
+	@$(call add,DEFAULT_SERVICES_DISABLE,consolesaver)
+	@$(call set,KFLAVOURS,un-def)
+	@$(call add,THE_KMODULES,kdbus)
+
+vm/cloud-sysv: vm/net use/vmguest/kvm use/power/acpi/button
+	@$(call add,BASE_PACKAGES,cloud-init)
+	@$(call add,DEFAULT_SERVICES_ENABLE,cloud-config cloud-final cloud-init cloud-init-local)
+
 # NB: use/x11 employs some installer-feature packages
 vm/.desktop-bare: vm/net use/x11/xorg use/cleanup/installer use/repo; @:
 
@@ -23,4 +44,8 @@ vm/icewm-setup: vm/.desktop-bare mixin/icewm use/oem use/x11-autostart
 	@$(call add,THE_BRANDING,graphics)
 	@$(call add,THE_LISTS,$(call tags,base l10n))
 
+# some arbitrary gigabyte
+vm/vagrant-base: vm/net use/vagrant
+	@$(call set,VM_SIZE,10737418240)
+
 endif

doc/Makefile

@@ -28,14 +28,14 @@ HTML_ARGS = -a data-uri --icons -r $(RESOURCE_FILES) -r . \
 	    --xsltproc-opts='$(XSLT_ARGS)' $(COMMON_ARGS)
 
 # most convenient deliverables
-DOCS_OUT = $(PROJECT).pdf $(PROJECT).html docbook-xsl.css
+DOCS_OUT = mkimage-profiles.7 $(PROJECT).pdf $(PROJECT).html docbook-xsl.css
 
 # intermediate files
 DOCS_TMP = $(PROJECT).fo $(PROJECT).xml
 
 .PHONY: all prep chunked xhtml pdf clean
 
-all: chunked xhtml pdf
+all: man chunked xhtml pdf
 
 # NB: destination defined externally
 publish: all
@@ -46,6 +46,13 @@ publish: all
 prep:
 	@if [ -n "$(BUILDDIR)" ]; then mkdir -p "$(BUILDDIR)"; fi
 
+man:
+	@VERSION="$$(sed -rn 's/^Version: ([0-9.]+).*$$/\1/p' \
+		../.gear/mkimage-profiles.spec)"; \
+	sed -e "s,@VERSION@,$$VERSION,g" \
+		< mkimage-profiles.7.in \
+		> mkimage-profiles.7
+
 chunked xhtml: prep
 	@echo "** building $@ book"
 	@$(A2X) -f $@ $(HTML_ARGS)

doc/archdep.txt

@@ -0,0 +1,46 @@
+== Архитектурно-зависимые фрагменты ==
+
+=== Makefile ===
+
+Достаточно воспользоваться ifeq/ifneq, сравнивая $(ARCH) с нужным:
+
+  ifeq (x86_64,$(ARCH))
+  EFI_LISTS := $(call tags,base efi)
+  endif
+
+При необходимости сравнить со списком ("любой x86") можно сделать так:
+
+  ifeq (,$(filter-out i586 x86_64,$(ARCH)))
+  use/x11/xorg: use/x11 use/x11/intel use/firmware
+  else
+  use/x11/xorg: use/x11
+  endif
+
+В рецептах (shell-часть Makefile) используйте $(ARCH) или $$ARCH.
+
+=== скрипты ===
+
+В скриптовых хуках ({image-,}scripts.d/*) проверяйте $GLOBAL_ARCH.
+
+=== списки пакетов ===
+
+Бывает так, что в списке пакетов есть смысл упоминать какой-либо из них
+только для определённой архитектуры (например, wine или steam); в таких
+случаях можно воспользоваться механизмом подстановки, который пословно
+обрабатывает списки и в случае наличия суффикса @ARCH оставляет только
+слова, в которых этот суффикс соответствует заданной архитектуре сборки.
+
+Например, для Simply Linux в mkimage-profiles-desktop есть строчки:
+
+  @I586_ONLY@haspd
+  @X86_64_ONLY@i586-haspd
+
+В случае mkimage-profiles они должны выглядеть так:
+
+  haspd@i586
+  i586-haspd@x86_64
+
+Для преобразования можно воспользоваться следующей командой:
+
+  sed -r -e 's/@I586_ONLY@([^\t ]+)/\1@i586/g' \
+         -e 's/@X86_64_ONLY@([^\t ]+)/\1@x86_64/g'

doc/assumptions.txt

@@ -16,6 +16,8 @@ ALT Linux 7.0+ и GNU make 3.82+ (на которых и разрабатыва
 ** ожидает, что каждая подлежащая трассированию цель каждого
     makefile при сборке конфигурации образа содержит непустой
     recipe -- хотя бы "; @:" -- т.к. зависит от запуска $(SHELL)
+** трассировка выполняется при REPORT=1 для формирования графа
+    зависимостей между промежуточными целями сборки конечного образа
 ** характерный признак пропуска -- разрыв графа (report-targets.png)
 
 * pkg.in/lists/Makefile

doc/debug.txt

@@ -1,4 +1,4 @@
-== Ловля плюх ==
+== Ловля блох ==
 
 При отладке сборки конфигурации или самого дистрибутива
 могут оказаться полезными следующие средства:

doc/mkimage-profiles.7.in

@@ -0,0 +1,141 @@
+.\" Copyright (C) 2010-2016 Michael Shigorin <mike@altlinux.org>
+.\"
+.\" Documentation for mkimage-profiles project.
+.\"
+.\" This file is free software; you can redistribute it and/or modify
+.\" it under the terms of the GNU General Public License as published by
+.\" the Free Software Foundation; either version 2 of the License, or
+.\" (at your option) any later version.
+.\" 
+.\" This program is distributed in the hope that it will be useful,
+.\" but WITHOUT ANY WARRANTY; without even the implied warranty of
+.\" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+.\" GNU General Public License for more details.
+.\" 
+.\" You should have received a copy of the GNU General Public License
+.\" along with this program; if not, write to the Free Software
+.\" Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
+.\" 
+.TH "MKIMAGE-PROFILES" "7" "February 2016" "mkimage-profiles @VERSION@" "ALT Linux"
+.SH "NAME"
+mkimage-profiles \- ALT Linux distribution family metaprofile
+.SH "SYNOPSIS"
+.B make
+.IR "" [ options ]
+.I "" [ <goal> ... ]
+.SH "DESCRIPTION"
+.BR mkimage-profiles
+builds operating environment images based on ALT Linux package repositories.
+
+Run
+.BR make\ help
+to obtain list of available goals.
+.SH "PREREQUISITES"
+mkimage-profiles only needs
+.BR make(1)
+and
+.BR rsync(1)
+to generate the build profile;
+.BR mkimage
+is used to actually run the build (which involves
+.BR hasher(7)
+quite a few times).
+
+.BR git(1)
+will be used if available so that the generated profile is an annotated
+git repository;
+.BR graphviz(1)
+can be used to obtain build dependency graphs.
+.SH "RATIONALE"
+Long time ago when Linux distribution images were worked upon by hand
+there was little need for generalization and sharing the common base.
+
+Building several "generic" ALT Linux distros in a team and maintaining
+their educational flavours at the same time proved the need to be able
+to describe what's common and what's different in a way that doesn't
+resemble more or less complete forks.
+
+Enter mkimage-profiles: choose what's closest to your dream image
+and add what's missing, or roll on your own using the rich library
+of existing parts and bits.
+.SH "REQUIREMENTS"
+The next-generation image build system for ALT Linux must:
+.TP
+1.
+provide reasonable means to describe common/differing aspects within
+image families;
+.TP
+2.
+ensure reproducible build results;
+.TP
+3.
+support distribution family maintenance workflows
+observed in the wild (e.g., with
+.BR mkimage-profiles-desktop
+or earlier);
+.TP
+4.
+help out with diagnosing build problems.
+.SH "ARCHITECTURE"
+.BR mkimage-profiles
+implements four steps to achieve the above goals:
+.TP
+1.
+initialize the off-tree mkimage profile (BUILDDIR);
+.TP
+2.
+build up distribution's configuration there;
+.TP
+3.
+copy over the needed subprofiles/features/lists/groups;
+.TP
+4.
+build the ISO/VE/VM image.
+.PP
+This results in a compact "as-needed" style per-image profile that can
+be actually studied in a short amount of time and might get included
+into the generated image as a tarball for better reproducibility.
+.SH "EXAMPLES"
+.BR make\ syslinux.iso
+should result in a minimal bootable ISO image.
+
+Another example is Regular Builds project yielding weekly images:
+.BR http://en.altlinux.org/regular
+.SH "AUTHOR"
+Written by Michael Shigorin <mike@altlinux.org>
+.SH "REPORTING BUGS"
+Report bugs to http://bugzilla.altlinux.org
+.br
+(Sisyphus project, mkimage-profiles component).
+.SH "COPYRIGHT"
+Copyright \(co) 2010-2016  Michael Shigorin <mike@altlinux.org>
+.br
+This is free software; see the source for copying conditions.
+There is NO WARRANTY; not even for MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE.
+.SH "FURTHER READING"
+First and foremost:
+.BR /usr/share/mkimage-profiles/QUICKSTART
+
+Please refer to 
+.BR README
+files in the tree starting with the toplevel one for more
+information; these can be assembled into a handbook using
+.BR asciidoc(1)
+(available at
+.BR http://nightly.altlinux.org/docs/
+as weekly HTML/PDF updates).
+
+Specific topics are covered within
+.BR doc/
+subdirectory; e.g.
+.BR make
+options are described in
+.BR doc/params.txt
+file.
+.SH "SEE ALSO"
+.br
+.BR hsh(1),
+.BR mkimage,
+.br
+.BR http://www.vimeo.com/23522095

doc/mkimage-profiles.asciidoc

@@ -80,3 +80,4 @@ include::vm.txt[]
 
 include::qemu.txt[]
 
+include::archdep.txt[]

doc/params.txt

@@ -18,6 +18,11 @@
 ** значение: пусто (по умолчанию авто) либо список через пробел
 ** см. Makefile, doc/profiles.mk.sample
 
+* AUTOCLEAN
+** включает уборку (distclean) после успешной сборки образа
+** значение: пусто (по умолчанию нет) либо любая строка
+** см. lib/build.mk
+
 * BELL
 ** подаёт сигнал после завершения сборки
 ** значение: пусто (по умолчанию нет) либо любая строка
@@ -70,6 +75,11 @@
 ** значение: пусто (по умолчанию) либо любая строка
 ** см. lib/build.mk
 
+* QUIET
+** отключает поясняющие сообщения при сборке (например, под cron)
+** значение: пусто (по умолчанию) либо любая строка
+** см. Makefile, lib/build.mk, lib/clean.mk, lib/profile.mk
+
 * REPORT
 ** запрашивает создание отчётов о собранном образе
 ** значение: пусто (по умолчанию) либо любая строка

doc/pkglists.txt

@@ -5,7 +5,7 @@
 некоторые "*" ниже заэкранированы ради парсера asciidoc):
 
 * main: пакетная база для установки
-** sub.in/main/Makefile, features.in/\*/main/lib/*.mk
+** sub.in/main/Makefile, features.in/*/main/lib/
 ** THE_LISTS, BASE_LISTS, MAIN_LISTS
 ** THE_GROUPS, MAIN_GROUPS
 ** THE_PACKAGES, BASE_PACKAGES, MAIN_PACKAGES,
@@ -15,7 +15,7 @@
 *** KFLAVOURS
 
 * stage2: общая часть install2, live, rescue
-** sub.in/stage2/Makefile, features.in/\*/stage2/lib/*.mk
+** sub.in/stage2/Makefile, features.in/*/stage2/lib/
 ** SYSTEM_PACKAGES, STAGE2_PACKAGES
 ** STAGE1_KMODULES, STAGE1_KMODULES_REGEXP,
     STAGE2_KMODULES, STAGE2_KMODULES_REGEXP
@@ -24,13 +24,13 @@
 * install2: компактная "живая" система, содержащая только инсталятор
 ** см. stage2
 *** features.in/install2/install2/stage2cfg.mk,
-    features.in/\*/install2/lib/*.mk
+    features.in/*/install2/lib/
 *** INSTALL2_PACKAGES
 
 * live: пользовательский LiveCD (может содержать также инсталятор)
 ** см. stage2
 ** features.in/live/live/stage2cfg.mk,
-    features.in/\*/live/lib/*.mk
+    features.in/*/live/lib/
 ** THE_LISTS, LIVE_LISTS
 ** THE_GROUPS, LIVE_GROUPS
 ** THE_PACKAGES, LIVE_PACKAGES, COMMON_PACKAGES
@@ -44,7 +44,7 @@
 ** RESCUE_LISTS
 
 * stage1: ядро и загрузчик второй стадии
-** sub.in/stage1/Makefile, features.in/\*/stage1/lib/*.mk
+** sub.in/stage1/Makefile, features.in/*/stage1/lib/
 ** STAGE1_PACKAGES, SYSTEM_PACKAGES
 ** STAGE1_PACKAGES_REGEXP
 ** STAGE1_KMODULES_REGEXP

doc/style.txt

@@ -9,7 +9,11 @@
   порой могут выясниться непредвиденные последствия;
 
 * документируйте на русском (README) или английском (README.en) языке
-  то, что написали или изменили.
+  то, что написали или изменили, если бы сами хотели прочесть описание
+  сделанного на месте другого человека; в любом случае старайтесь
+  внятно описывать коммиты, при необходимости также спрашивайте
+  совета: документация кода порой не менее важна, чем сам код,
+  и призвана не повторять его, но пояснять намерения и неочевидности.
 
 [float]
 === рекомендации ===
@@ -29,7 +33,11 @@
 
 * предпочтительно применение $() вместо `` (особенно при вложенности);
 
-* постарайтесь не вылазить за 80 колонок.
+* постарайтесь не вылазить за 80 колонок;
+
+* избегайте merge-коммитов в коде, который предлагаете для включения
+  в основную ветку: поддерживается линейная история для удобства
+  работы с промежуточными состояниями.
 
 [float]
 

doc/vm.txt

@@ -14,7 +14,9 @@
 При работе с локальной копией mkimage-profiles.git следует иметь
 в виду, что предоставлять недоверенному пользователю право выполнять
 от имени root доступный ему по записи скрипт равнозначно предоставлению
-полных привилегий root.
+полных привилегий root (поэтому фича build-vm сперва проверяет наличие
+системно установленного пакета и по возможности старается запустить
+под sudo скрипт из него, доступный по записи только root).
 
 Для работы с более специфичными форматами, чем raw ("буквальный"
 образ диска), потребуется утилита qemu-img из одноименного пакета;

features.in/Makefile

@@ -25,6 +25,9 @@ define grepper_body
 	done
 endef
 
+check:
+	@../bin/check-recipe */config.mk
+
 %:
 	$(error BUILDDIR not defined)
 
@@ -65,6 +68,8 @@ prep:
 #     - "rootfs@/": copy feature's rootfs parts into BUILDDIR toplevel
 $(FEATURES):
 	@feat=$@; \
+	args="-qab --exclude README --exclude config.mk"; \
+	args="$$args --exclude generate.mk --exclude generate.sh"; \
 	if [ -n "$(GLOBAL_DEBUG)" ]; then \
 		echo "** adding $$feat feature"; \
 	fi; \
@@ -92,7 +97,7 @@ $(FEATURES):
 			fi; \
 			: "why this overduplication was done? (still needed)"; \
 			for srcdir in $$srcdirs; do \
-				rsync -qab "$$srcdir/" "$(BUILDDIR)/$$dst/"; \
+				rsync $$args "$$srcdir/" "$(BUILDDIR)/$$dst/"; \
 			done; \
 		fi; \
 		if [ -n "$(GLOBAL_DEBUG)" ]; then \
@@ -105,7 +110,7 @@ $(FEATURES):
 				destdir="$(BUILDDIR)/$$dst/$$part"; \
 				[ -d "$$destdir" ] || continue; \
 				if [ "$$sub" = / -a -d "$$part" ]; then \
-					rsync -qab "$$part/" "$$destdir/"; \
+					rsync $$args "$$part/" "$$destdir/"; \
 				fi; \
 			done; \
 			popd >&/dev/null; \

features.in/armh-cubox/stage1/modules.d/50-armh-cubox

@@ -0,0 +1 @@
+ehci_marvell

features.in/branding/lib/20-branding.mk

@@ -1,5 +1,4 @@
 # step 4: build the distribution image
-# NB: this comes just before build-distro.mk
 
 DOT_BASE += $(call branding,$(THE_BRANDING))
 

features.in/browser/config.mk

@@ -1,9 +1,13 @@
 use/browser:
 	@$(call add_feature)
 	@$(call add,THE_PACKAGES_REGEXP,$$(THE_BROWSER))
-	@$(call try,THE_BROWSER,webclient)	# fallback
+	@$(call try,THE_BROWSER,elinks)	# X11-less fallback
 
-use/browser/firefox use/browser/seamonkey \
+# support both firefox and firefox-esr
+use/browser/firefox: use/browser
+	@$(call set,THE_BROWSER,firefox$$(FX_FLAVOUR))
+
+use/browser/seamonkey use/browser/palemoon \
 	use/browser/chromium use/browser/epiphany \
 	use/browser/qupzilla use/browser/rekonq \
 	use/browser/elinks use/browser/links2: \
@@ -16,12 +20,23 @@ use/browser/konqueror: use/browser
 use/browser/konqueror4: use/browser
 	@$(call set,THE_BROWSER,kde4base-konqueror)
 
+# the complete lack of dependencies is intentional
+use/browser/firefox/esr: use/browser
+	@$(call set,FX_FLAVOUR,-esr)
+
+use/browser/firefox/h264: use/browser/firefox
+	@$(call add,THE_BROWSER,gst-libav)
+	@$(call add,THE_BROWSER,gst-plugins-base1.0 gst-plugins-good1.0)
+
 use/browser/firefox/live: use/browser/firefox
 	@$(call add,THE_BROWSER,livecd-firefox)
 
 # scarey, and will have to be done otherwise when l10n feature is there
 use/browser/firefox/i18n: use/browser/firefox
-	@$(call add,THE_BROWSER,firefox-be firefox-kk firefox-ru firefox-uk)
+	@$(call add,THE_BROWSER,firefox$$(FX_FLAVOUR)-be)
+	@$(call add,THE_BROWSER,firefox$$(FX_FLAVOUR)-kk)
+	@$(call add,THE_BROWSER,firefox$$(FX_FLAVOUR)-ru)
+	@$(call add,THE_BROWSER,firefox$$(FX_FLAVOUR)-uk)
 
 # fx29+
 use/browser/firefox/classic: use/browser/firefox
@@ -30,9 +45,12 @@ use/browser/firefox/classic: use/browser/firefox
 use/browser/seamonkey/i18n: use/browser/seamonkey
 	@$(call add,THE_BROWSER,seamonkey-ru)
 
+use/browser/palemoon/i18n: use/browser/palemoon
+	@$(call add,THE_BROWSER,palemoon-ru)
+
 # inherently insecure, NPAPI only
 use/browser/plugin/flash: use/browser
 	@$(call add,THE_PACKAGES,mozilla-plugin-adobe-flash)
 
 use/browser/plugin/java: use/browser
-	@$(call add,THE_PACKAGES,mozilla-plugin-java-1.6.0-sun)
+	@$(call add,THE_PACKAGES,mozilla-plugin-java-1.8.0-openjdk)

features.in/build-distro/lib/90-build-distro.mk

@@ -17,10 +17,10 @@ DATE_F    := $(shell date +%F)
 
 BOOT_TYPE := isolinux
 
-all: $(GLOBAL_DEBUG) prep copy-subdirs copy-tree run-scripts pack-image \
+all: | $(GLOBAL_DEBUG) prep copy-subdirs copy-tree run-scripts pack-image \
 	postprocess $(GLOBAL_CLEAN_WORKDIR)
 
-prep: $(GLOBAL_DEBUG) dot-disk $(WHATEVER)
+prep: | $(GLOBAL_DEBUG) dot-disk $(WHATEVER)
 
 # can't use mp-showref which belongs to the metaprofile
 dot-disk:

features.in/build-vm/image-scripts.d/07-kernel

@@ -1,6 +1,6 @@
 #!/bin/sh
 # predictable file locations make bootloader configuration simple;
-# this script relates to features.in/stage2/stage1/scripts.d/80-make-initfs
+# this script relates to features.in/stage2/stage1/scripts.d/81-make-initfs
 
 kver="$(rpm -qa 'kernel-image*' \
             --qf '%{installtime} %{version}-%{name}-%{release}\n' \

features.in/build-vm/lib/90-build-vm.mk

@@ -20,9 +20,12 @@ check-sudo:
 	fi
 
 prepare-image: check-sudo
-	@if ! sudo $(TOPDIR)/bin/tar2fs \
+	@if [ -x $(MKIMAGE_PREFIX)/bin/tar2fs ]; then \
+		TOPDIR=$(MKIMAGE_PREFIX); \
+	fi; \
+	if ! sudo $(TOPDIR)/bin/tar2fs \
 		"$(VM_TARBALL)" "$(VM_RAWDISK)"  $(VM_SIZE) $(VM_FSTYPE); then \
-		echo "** error: sudo tar2fs failed, see also doc/vm.txt" >&2; \
+		echo "** error: sudo tar2fs failed, see build log" >&2; \
 		exit 1; \
 	fi
 
@@ -38,6 +41,7 @@ convert-image: prepare-image
 		qemu-img convert -O "$$VM_FORMAT" \
 			"$(VM_RAWDISK)" "$(IMAGE_OUTPATH)"; \
 		rm "$(VM_RAWDISK)"; \
+		if [ -z "$(DEBUG)" ]; then rm "$(VM_TARBALL)"; fi; \
 	fi
 
 run-image-scripts: GLOBAL_CLEANUP_PACKAGES := $(CLEANUP_PACKAGES)

features.in/cleanup/README

@@ -4,3 +4,10 @@
 По возможности стоит работать над дизайном инфраструктуры
 и пакетной базой так, чтобы ставить-удалять приходилось как
 можно меньше.  В идеале такой антифичи не должно быть вовсе :)
+
+Для пакетов, которые следует удалять из установленной классическим
+инсталятором системы, но не из livecd, применяйте переменную
+CLEANUP_BASE_PACKAGES.
+
+ВНИМАНИЕ: также удаляет rpm, apt и базу по пакетам из livecd,
+если в него не был добавлен инсталятор!

features.in/cleanup/config.mk

@@ -1,20 +1,43 @@
 use/cleanup:
 	@$(call add_feature)
 	@$(call xport,CLEANUP_PACKAGES)
+	@$(call xport,CLEANUP_BASE_PACKAGES)
+
+use/cleanup/libs:
+	@$(call add,BASE_PACKAGES,apt-scripts)
+	@$(call add,INSTALL2_PACKAGES,installer-feature-cleanup-libs-stage3)
 
 use/cleanup/installer: use/cleanup
-	@$(call add,CLEANUP_PACKAGES,'installer-*')
+	@$(call add,CLEANUP_BASE_PACKAGES,'installer-*')
 
-use/cleanup/x11: use/cleanup
-	@$(call add,CLEANUP_PACKAGES,libSM libXext libXmu libXi)
+use/cleanup/x11: use/cleanup use/cleanup/libs
+	@$(call add,CLEANUP_PACKAGES,libICE libSM libxcb 'libX*')
 
 # as some alterator modules are installed into stage3 (the destination
 # root filesystem) to perform actions like bootloader setup, we might
 # have to remove them (contrary to the usual build-up)...
 use/cleanup/alterator: use/cleanup
 	@$(call add,CLEANUP_PACKAGES,'alterator*' rpm-macros-alterator)
-	@$(call add,CLEANUP_PACKAGES,'guile*' libvhttpd)
+	@$(call add,CLEANUP_PACKAGES,'guile*' libvhttpd autologin-sh-functions)
 
 # for lightweight server distros
 use/cleanup/x11-alterator: use/cleanup/x11 use/cleanup/alterator
 	@$(call add,CLEANUP_PACKAGES,libmng qt4-common)
+
+# "basically everything else"; this *will* change with branches and distros
+use/cleanup/jeos: use/cleanup/x11-alterator
+	@$(call add,CLEANUP_PACKAGES,liblcms libjpeg 'libpng*' 'libtiff*')
+	@$(call add,CLEANUP_PACKAGES,avahi-autoipd iw wpa_supplicant)
+	@$(call add,CLEANUP_PACKAGES,openssl libpcsclite)
+	@# a *lot* of stray things get pulled in by alterator modules
+	@$(call add,CLEANUP_PACKAGES,libfreetype fontconfig)
+	@$(call add,CLEANUP_PACKAGES,liblcms libjpeg 'libpng*' 'libtiff*')
+	@$(call add,CLEANUP_PACKAGES,openssl libpcsclite)
+
+# mostly non-interactive system
+use/cleanup/jeos/full: use/cleanup/jeos
+	@$(call add,CLEANUP_PACKAGES,interactivesystem 'groff*' man stmpclean)
+	@$(call add,CLEANUP_PACKAGES,glibc-gconv-modules gettext)
+	@$(call add,CLEANUP_PACKAGES,console-scripts console-vt-tools 'kbd*')
+	@$(call add,CLEANUP_PACKAGES,libsystemd-journal libsystemd-login)
+	@$(call add,CLEANUP_PACKAGES,dbus libdbus)

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

@@ -3,9 +3,14 @@
 
 if [ -n "$GLOBAL_VERBOSE" ]; then
 	echo "** GLOBAL_CLEANUP_PACKAGES: $GLOBAL_CLEANUP_PACKAGES"
+	echo "** GLOBAL_CLEANUP_BASE_PACKAGES: $GLOBAL_CLEANUP_BASE_PACKAGES"
 fi >&2
 
+export GLOBAL_CLEANUP_PACKAGES="$GLOBAL_CLEANUP_PACKAGES \
+	$GLOBAL_CLEANUP_BASE_PACKAGES"
+
 SCRIPT="/usr/share/install2/postinstall.d/01-remove-pkgs"
+
 cat > "$SCRIPT" << EOF
 #!/bin/sh -efu
 

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

@@ -1,5 +1,8 @@
 #!/bin/sh
 # remove all docs
 
+# don't cripple the image to be copied over
+[ -x /usr/sbin/live-install -o -x /usr/sbin/livecd-install ] && exit 0
+
 rpmquery -ad |grep ^/ |xargs -r rm -f --
 rm -rf /usr/share/{doc,man,info,license,gfxboot}

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

@@ -1,6 +1,7 @@
 #!/bin/sh -efu
 # remove extra packages from a bare livecd
 
+[ -n "$GLOBAL_CLEANUP_PACKAGES" ] || exit 0
 list="$(rpmquery -a --qf='%{NAME}\n' $GLOBAL_CLEANUP_PACKAGES)"
 [ -z "$list" ] || apt-get remove -f -y -- $list
 :

features.in/cleanup/live/image-scripts.d/99-cleanupdb

@@ -1,4 +1,8 @@
 #!/bin/sh
+
+# don't cripple the image to be copied over
+[ -x /usr/sbin/live-install -o -x /usr/sbin/livecd-install ] && exit 0
+
 # dump what's here by this point
 echo "** live packages before rpmdb purge:"
 rpmquery -a --qf='%{NAME} %{VERSION}-%{RELEASE}\n'

features.in/control/config.mk

@@ -6,3 +6,18 @@ use/control:
 # some presets
 use/control/sudo-su: use/control
 	@$(call add,CONTROL,su:public sudo:public)
+
+# recommended by ldv@ ;-)
+# note that:
+# - sshd-allow-groups results in "AllowGroups wheel users"
+# - unprivileged su is used to drop privileges, not gain those
+use/control/server/ldv: use/control
+	@$(call add,CONTROL,mount:unprivileged)
+	@$(call add,CONTROL,passwdqc-enforce:everyone)
+	@$(call add,CONTROL,ping:netadmin)
+	@$(call add,CONTROL,ping6:restricted)
+	@$(call add,CONTROL,postqueue:mailadm)
+	@$(call add,CONTROL,sftp:disabled)
+	@$(call add,CONTROL,sshd-allow-groups:enabled)
+	@$(call add,CONTROL,sshd-password-auth:disabled)
+	@$(call add,CONTROL,su:restricted)

features.in/control/install2/image-scripts.d/51-control

@@ -0,0 +1,7 @@
+#!/bin/sh
+# setup control(8) states for the installed system
+# FIXME: drop this when rootfs scripts/data get installer support
+
+[ -z "$GLOBAL_CONTROL" ] ||
+	echo "$GLOBAL_CONTROL" |
+		tr ' :' '\n ' > /usr/share/install2/control

features.in/deflogin/config.mk

@@ -39,3 +39,7 @@ use/deflogin/xgrp: use/deflogin
 # potentially elevated privileges (NB: _not_ wheel)
 use/deflogin/privileges: use/deflogin
 	@$(call add,GROUPS,fuse netadmin proc users)
+
+# NM with sysvinit
+use/deflogin/sysv/nm: use/deflogin
+	@$(call add,GROUPS,_nmconnect)

features.in/deflogin/rootfs/image-scripts.d/50-issue

@@ -2,7 +2,10 @@
 # issue welcome message if there's a guest user
 # (the first one configured with empty password)
 
-[ -n "$GLOBAL_USERS" ] || exit 1
+[ -n "$GLOBAL_USERS" ] || {
+	echo "** 50-issue: warning, no users created" >&1
+	exit 0
+}
 
 guest=
 for u in $GLOBAL_USERS; do

features.in/deflogin/rootfs/image-scripts.d/50-users

@@ -18,6 +18,7 @@ set_password() { echo "$1:$2" | chpasswd; }
 
 set_admin() { usermod -a --groups "wheel" "$1"; }
 
+# NB: one must care to purge this from LiveCD if it's installed permanently
 set_sudo() {
 	[ ! -w "/etc/sudoers" ] ||
 		echo "$1	ALL=(ALL) ALL" >> "/etc/sudoers"

features.in/dev/README

@@ -3,3 +3,9 @@
 
 Реализована поддержка LiveCD, возможно приспособление для образов
 сборочных VM/VE.
+
+Обратите внимание: эта фича достаточно серьёзно изменяет поведение
+субпрофиля main, оставляя из всего обычного множества обрабатываемых
+переменных только MAIN_PACKAGES, MAIN_PACKAGES_REGEXP и MAIN_LISTS
+во избежание дублирования не требующихся для сборки минимальных
+образов пакетов.

features.in/dev/config.mk

@@ -11,3 +11,16 @@ use/dev/repo: use/dev use/repo/main
 	@$(call add,MAIN_PACKAGES,rpm-build basesystem)
 	@$(call add,MAIN_PACKAGES,fakeroot sisyphus_check)
 	@$(call add,MAIN_PACKAGES,file make-initrd make-initrd-propagator)
+
+use/dev/builder/base: use/dev/mkimage use/dev
+	@$(call set,KFLAVOURS,$(BIGRAM))
+	@$(call add,LIVE_LISTS,\
+		$(call tags,(base || live) && (server || builder)))
+	@$(call add,LIVE_PACKAGES,livecd-qemu-arch strace)
+	@$(call add,LIVE_PACKAGES,qemu-user-binfmt_misc)
+	@$(call add,LIVE_PACKAGES,perl-Gear-Remotes)
+
+use/dev/builder/full: use/dev/builder/base use/dev/repo
+	@$(call add,MAIN_LISTS,$(call tags,live builder))
+	@$(call add,MAIN_PACKAGES,syslinux pciids memtest86+ xorriso)
+	@$(call add,LIVE_PACKAGES,sudo)

features.in/dev/live/image-scripts.d/51-hasher

@@ -1,6 +1,33 @@
 #!/bin/sh -efu
 # configure hasher (implies that 30-users has been run already)
 
+ARCH="$(rpm --eval '%_host_cpu')"
+[ -n "$ARCH" ] || exit 2
+
+gray="$(echo -ne "\\033[0;37m")"
+white="$(echo -ne "\\033[1;37m")"
+cyan="$(echo -ne "\\033[1;36m")"
+
+# root
+cat >> /root/.bash_profile << EOF
+
+ram="\$(awk '/^MemTotal/ { print int(\$2/1024+0.5) }' /proc/meminfo)"
+swap="\$(awk '/^SwapTotal/ { print int(\$2/1024+0.5) }' /proc/meminfo)"
+tmpfs="\$(df -kT /tmp 2>/dev/null \\
+	| awk '/^[a-zA-Z_0-9/-]+[[:space:]]+tmpfs/ { print int(\$3/1024); }')"
+
+cat << EOH
+Welcome to live builder host system!
+
+Memory: $cyan\${ram}M$gray, swap: $cyan\${swap}M$gray
+Autoconfigured tmpfs on /tmp: $cyan\${tmpfs}M$gray
+
+Run ${white}swapon${gray}(8) on any local swaps you might like to employ
+followed by ${white}service livecd-tmpfs restart${gray} to reconfigure tmpfs
+
+EOH
+EOF
+
 # predefined passwordless livecd user
 USER="altlinux"
 if ! id "$USER" >&/dev/null; then
@@ -12,6 +39,9 @@ fi
 HOME="/home/$USER"
 install -dm750 -o "$USER" -g "$USER" "$HOME"
 
+# http://altlinux.org/tmpfs
+TMP="/tmp/.private/$USER"
+
 # we honestly don't know much more
 if type -t git && type -t su; then
 	su - -c "git config --global user.email $USER@localhost" "$USER"
@@ -22,18 +52,62 @@ fi >&/dev/null
 ZSHELL="/bin/zsh"
 if [ -x "$ZSHELL" ]; then
 	chsh -s "$ZSHELL" "$USER"
-	install -m755 -o "$USER" -g "$USER" /dev/null "$HOME/.zshrc"
-	echo "mkdir -p \"\$TMP/hasher\"" >> "$HOME/.zshrc"
+	install -m644 -o "$USER" -g "$USER" /dev/null "$HOME/.zshrc"
+	cat >> "$HOME/.zsh_history" <<-EOF
+	git clone git://git.altlinux.org/gears/m/mkimage-profiles.git && cd mkimage-profiles && make help/distro
+	make -C /usr/share/mkimage-profiles syslinux.iso
+	git clone git://git.altlinux.org/gears/h/hello.git && cd hello && gear-hsh
+	EOF
 fi
 
-# $TMP
-TMP="/tmp/.private/$USER"
-sed -i '/^%_tmppath.*tmp$/d' "$HOME/.rpmmacros"
-echo "%_tmppath	$TMP" >> "$HOME/.rpmmacros"
+if type -t screen; then
+	cat >> "$HOME/.screenrc" <<-EOF
+	caption always "%{+b rk}%H%{gk} |%c %{yk}%d.%m.%Y | %72=Load: %l %{wk}"
+	defscrollback 1000
+	EOF
+fi >&/dev/null
 
-# ~/hasher
+cat >> "$HOME/.profile" << EOF
+alias l='ls -l'
+alias m='cd /usr/share/mkimage-profiles'
+clear
+cat << EOH
+Welcome to live builder environment!
+Here are some ALT Linux package/image build tools prepared for you:
+* ${white}gear${gray}(1) -- see ${cyan}http://en.altlinux.org/gear${gray};
+* ${white}hsh${gray}(1)  -- see ${cyan}http://en.altlinux.org/hasher${gray};
+* ${white}mkimage${gray} -- see ${cyan}http://en.altlinux.org/mkimage${gray};
+* ${white}mkimage-profiles${gray} described in Russian at ${cyan}http://altlinux.org/m-p${gray}
+
+Examples (use right/middle mouse button to paste; see ~/hasher/repo/):
+* ${white}git clone git://git.altlinux.org/gears/h/hello.git && cd hello && gear-hsh${gray}
+* ${white}make -C /usr/share/mkimage-profiles syslinux.iso${gray}
+
+EOH
+EOF
+
+# rpm
+sed -i '/^%_tmppath.*tmp$/d' "$HOME/.rpmmacros"
+cat << EOF >> "$HOME/.rpmmacros"
+%packager	Unknown <nobody@altlinux.org>
+%_target_cpu	$ARCH
+%_tmppath	$TMP
+%_sourcedir	%{_topsrcdir}/SOURCES/%name
+EOF
+
+# hasher
 WORKDIR="$TMP/hasher"
-ln -s "$TMP/hasher" "$HOME/hasher"
+ln -s "$WORKDIR" "$HOME/hasher"
+echo "rpm-dir file://$HOME/hasher/repo $ARCH hasher" \
+	>> /etc/apt/sources.list.d/hasher.list
+
+mkdir "$HOME/.hasher"
+cat >> "$HOME/.hasher/config" << EOF
+packager="\$(rpm --eval %packager)"
+def_target=$ARCH
+export GCC_USE_CCACHE=1
+mkdir -p "$WORKDIR"
+EOF
 
 # online repo needs network not isolation
 echo "export share_network=1" >> /etc/profile.d/hasher.sh

features.in/dev/main/lib/50-override.mk

@@ -0,0 +1,4 @@
+# only MAIN_* should go in this time
+
+IMAGE_PACKAGES_REGEXP = $(MAIN_PACKAGES_REGEXP)
+IMAGE_PACKAGES = $(MAIN_PACKAGES) $(call map,list,$(MAIN_LISTS))

features.in/docs/README

@@ -0,0 +1,12 @@
+Эта фича добавляет в образ распакованную документацию дистрибутива,
+а именно вводную страничку (входит в пакет branding-*-indexhtml),
+и/или специфичное для данного продукта руководство из пакета docs-*
+(вариант задаётся отдельно выставлением переменной DOCS),
+и/или тексты лицензионных соглашений.
+
+Обратите внимание, что для indexhtml создаётся переброска с учётом
+языка (при наличии index-LL.html), поэтому ожидается задействование
+фичи l10n с соответствующим указанием языка по умолчанию.
+
+NB: предполагается применение при формировании ISO-образов,
+другие случаи наверняка потребуют доработки.

features.in/docs/config.mk

@@ -0,0 +1,21 @@
+# copy the packaged docs to image root
+# packaged documentation sources:
+# 1) branding-*-indexhtml
+# 2) docs-* (should be installed elsewhere)
+
++docs: use/docs; @:
+
+use/docs:
+	@$(call add_feature)
+
+use/docs/indexhtml: use/docs use/branding
+	@$(call add,THE_BRANDING,indexhtml)
+
+use/docs/manual: use/docs
+	@$(call xport,DOCS)
+	@$(call add,THE_PACKAGES,docs-$$(DOCS))
+
+use/docs/license: use/docs use/branding
+	@$(call add,THE_BRANDING,notes)
+
+use/docs/full: use/docs/indexhtml use/docs/manual use/docs/license; @:

features.in/docs/lib/30-docs.mk

@@ -0,0 +1,14 @@
+# step 4: build the distribution image
+
+ifneq (,$(DOCS))
+DOT_BASE += docs-$(DOCS)
+CHROOT_PACKAGES += docs-$(DOCS)
+endif
+
+ifneq (,$(findstring notes,$(THE_BRANDING) $(INSTALL2_BRANDING)))
+CHROOT_PACKAGES_REGEXP += $(call branding,notes)
+endif
+
+ifneq (,$(findstring indexhtml,$(THE_BRANDING)))
+CHROOT_PACKAGES_REGEXP += $(call branding,indexhtml)
+endif

features.in/docs/scripts.d/50-docs-indexhtml

@@ -0,0 +1,46 @@
+#!/bin/sh -e
+
+# trailing slash is important here
+dest="docs/"
+
+mkdir -p "$WORKDIR/$dest"
+cd $WORKDIR
+
+nonfatal() { echo "** $*" >&2; exit 0; }
+
+indexdir="/usr/share/doc/indexhtml"
+indexfile="$indexdir/index.html"
+
+[ -s "$indexfile" ] || nonfatal "$indexfile not found"
+
+[ -n "$GLOBAL_LOCALE" ] ||
+	echo "** warning: GLOBAL_LOCALE empty, fallback to en_US (use/l10n?)">&2
+
+LANG="${GLOBAL_LOCALE:-en_US}" indexhtml-update
+
+# http://unix.stackexchange.com/questions/94185/convert-soft-to-hardlinks
+cp -aH "$indexdir" "$dest"
+
+mkredir() {
+	cat >"${1}index.html" <<-EOF
+	<html>
+	<head>
+	<meta http-equiv="refresh" content="0;url=${2}indexhtml/index.html">
+	<title>Redirecting...</title>
+	</head>
+	<body>
+	<h1>Redirecting...</h1>
+	</body>
+	</html>
+	EOF
+}
+
+mkredir "" "$dest"	# /index.html -> docs/indexhtml/index.html
+mkredir "$dest" ""	# docs//index.html -> indexhtml/index.html
+
+docdir="/usr/share/doc/documentation"
+[ -d "$docdir" ] || nonfatal "$docdir not found"
+
+cp -aH "$docdir" "$dest"
+
+### no need to replace symlinks with hardlinks by now? (-aH)

features.in/docs/scripts.d/50-docs-license

@@ -0,0 +1,9 @@
+#!/bin/sh
+# copy distro's licenses into image's rootdir
+
+cd /usr/share/alt-notes || exit 0
+
+find -maxdepth 1 -type f -name "license*.html" -print |
+while read FILE; do
+	cp -av "$FILE" $WORKDIR/
+done

features.in/efi/config.mk

@@ -14,13 +14,15 @@ use/efi:
 	@$(call add,INSTALL2_PACKAGES,dosfstools fatresize)
 	@$(call try,EFI_BOOTLOADER,elilo)	# default one
 	@$(call add,STAGE1_KCONFIG,EFI EFI_PARTITION EFI_VARS FB_EFI)
+	@$(call set,MKI_VER_OPTIMAL,0.2.17)	# for EFI_BOOTARGS
+	@$(call add,EFI_BOOTARGS,$$(STAGE2_BOOTARGS))
 
 use/efi/refind: use/efi
 	@$(call set,EFI_BOOTLOADER,refind)
 
 use/efi/signed: use/efi
 	@$(call set,EFI_CERT,altlinux)
-	@$(call add,THE_PACKAGES,shim-signed)
+	@$(call add,COMMON_PACKAGES,shim-signed)
 	@$(call add,RESCUE_PACKAGES,openssl pesign sbsigntools)
 
 use/efi/shell: use/efi
@@ -31,12 +33,11 @@ use/efi/memtest86: use/efi/refind
 
 use/efi/debug: use/efi
 	@$(call add,STAGE2_PACKAGES,efibootmgr gdisk)
-	@$(call set,KFLAVOURS,led-ws)
 
 else
 
 # ignore on an unsupported target arch but make it hybrid at least
 use/efi use/efi/signed use/efi/debug \
-  use/efi/refind use/efi/shell use/efi/memtest86: use/isohybrid
+  use/efi/refind use/efi/shell use/efi/memtest86: use/isohybrid; @:
 
 endif

features.in/firmware/config.mk

@@ -6,23 +6,31 @@ use/firmware:
 	@$(call add_feature)
 	@$(call add,SYSTEM_PACKAGES,firmware-linux)
 
-use/firmware/full: use/firmware/server use/firmware/laptop
+use/firmware/full: use/firmware/server use/firmware/laptop; @:
 
 use/firmware/cpu: use/firmware
-	@$(call add,THE_PACKAGES,microcode-data-intel microcode_ctl)
+	@$(call add,THE_PACKAGES,firmware-intel-ucode iucode_tool)
 
 use/firmware/server: use/firmware
 	@$(call add,SYSTEM_PACKAGES,firmware-aic94xx-seq)
 	@$(call add,THE_PACKAGES_REGEXP,firmware-ql.*)
 
+use/firmware/qlogic: use/firmware
+	@$(call add,SYSTEM_PACKAGES,firmware-ql2100)
+	@$(call add,SYSTEM_PACKAGES,firmware-ql2200)
+	@$(call add,SYSTEM_PACKAGES,firmware-ql2300)
+	@$(call add,SYSTEM_PACKAGES,firmware-ql2322)
+	@$(call add,SYSTEM_PACKAGES,firmware-ql2400)
+	@$(call add,SYSTEM_PACKAGES,firmware-ql2500)
+	@$(call add,SYSTEM_PACKAGES,firmware-ql6312)
+
 # NB: individual firmwarez would sometimes conflict
 #     with ones newly merged into firmware-linux
-# FIXME: kernel modules rather belong to use/hardware
-use/firmware/wireless: use/firmware use/kernel/wireless
+use/firmware/wireless: use/firmware
 	@$(call add,THE_PACKAGES,firmware-acx100)
 	@$(call add,THE_PACKAGES_REGEXP,firmware-prism.*)
 	@$(call add,THE_PACKAGES_REGEXP,firmware-ipw.*)
 	@$(call add,THE_PACKAGES_REGEXP,firmware-zd.*)
 
-use/firmware/laptop: use/firmware/wireless use/firmware/cpu
+use/firmware/laptop: use/firmware/cpu
 	@$(call add,KMODULES,acpi_call)

features.in/fonts/config.mk

@@ -4,6 +4,10 @@ use/fonts:
 	@$(call xport,FONT_FEATURES_ENABLE)
 	@$(call xport,FONT_FEATURES_DISABLE)
 
+# standalone target to specify non-bitmap installer fonts
+use/fonts/install2:
+	@$(call add,SYSTEM_PACKAGES,fonts-ttf-google-croscore-arimo)
+
 # just stating that kernels and font habits are pretty individual
 use/fonts/zerg: use/fonts
 	@$(call set,FONT_FEATURES_ENABLE,antialias lcdfilter-default \
@@ -27,7 +31,9 @@ use/fonts/otf/mozilla:
 	@$(call add,THE_PACKAGES,fonts-otf-mozilla-fira)
 
 use/fonts/ttf/google:
-	@$(call add,THE_PACKAGES,fonts-ttf-droid)
+	@$(call add,THE_PACKAGES,fonts-ttf-google-droid-sans)
+	@$(call add,THE_PACKAGES,fonts-ttf-google-droid-sans-mono)
+	@$(call add,THE_PACKAGES,fonts-ttf-google-droid-serif)
 	@$(call add,THE_PACKAGES,fonts-ttf-google-croscore-arimo)
 	@$(call add,THE_PACKAGES,fonts-ttf-google-croscore-cousine)
 	@$(call add,THE_PACKAGES,fonts-ttf-google-croscore-tinos)

features.in/im/README

@@ -0,0 +1,4 @@
+Эта фича добавляет средства настройки методов ввода (Input Methods).
+
+На данный момент является экспериментальной, приветствуется помощь
+в тестировании/доработке/отладке.

features.in/im/config.mk

@@ -0,0 +1,6 @@
+# Input Method configuration through IBus
+
+use/im:
+	@$(call add_feature)
+	@$(call add,THE_PACKAGES,$$(IM_PACKAGES))
+	@$(call add,THE_LISTS,$(call tags,desktop ibus))

features.in/init/config.mk

@@ -1,5 +1,5 @@
 +sysvinit: use/init/sysv; @:
-+systemd: use/init/systemd; @:
++systemd: use/init/systemd/full; @:
 
 use/init:
 	@$(call add_feature)
@@ -10,10 +10,22 @@ use/init:
 use/init/sysv: use/init
 	@$(call set,INIT_TYPE,sysvinit)
 	@$(call add,BASE_PACKAGES,syslogd)
-	@$(call add,BASE_PACKAGES_REGEXP,^systemd- ^systemd-services-)
+
+use/init/sysv/polkit: use/init/sysv
+	@$(call add,THE_PACKAGES,polkit-sysvinit)
 
 ### i-f should be dropped as soon as rootfs scripts are effective there
 use/init/systemd: use/init
 	@$(call set,INIT_TYPE,systemd)
-	@$(call add,BASE_PACKAGES,installer-feature-systemd-stage3)
-	@$(call add,BASE_PACKAGES,installer-feature-journald-tty)
+	@$(call add,INSTALL2_PACKAGES,installer-feature-journald-tty)
+
+use/init/systemd/full: use/init/systemd
+	@$(call add,THE_PACKAGES,bash-completion-systemd)
+
+# http://www.freedesktop.org/wiki/Software/systemd/Debugging
+use/init/systemd/debug: use/init/systemd use/services
+	@$(call add,THE_PACKAGES,systemd-shutdown-debug-script)
+	@$(call add,SERVICES_ENABLE,debug-shell)
+	@$(call add,STAGE2_BOOTARGS,systemd.log_level=debug)
+	@$(call add,STAGE2_BOOTARGS,systemd.log_target=kmsg)
+	@$(call add,STAGE2_BOOTARGS,log_buf_len=1M enforcing=0)

features.in/init/rootfs/image-scripts.d/40-sysvinit

@@ -0,0 +1,10 @@
+#!/bin/sh
+# 40: should run before 50-users in deflogin
+
+# the part below relates to sysvinit specifically
+rpm -q sysvinit || exit 0
+
+# NM-specific group
+case "$GLOBAL_GROUPS" in
+	*_nmconnect*) groupadd -r _nmconnect ||:;;
+esac

features.in/install2/config.mk

@@ -3,7 +3,7 @@
 +installer: use/install2/full; @:
 
 use/install2: use/stage2 sub/stage2@install2 use/metadata \
-	use/cleanup/installer use/bootloader
+	use/cleanup/installer
 	@$(call add_feature)
 	@$(call try,INSTALLER,altlinux-generic)	# might be replaced later
 	@$(call add,INSTALL2_PACKAGES,installer-distro-$$(INSTALLER)-stage2)
@@ -16,8 +16,18 @@ use/install2: use/stage2 sub/stage2@install2 use/metadata \
 	@$(call xport,INSTALL2_CLEANUP_KDRIVERS)
 
 # doesn't use/install2/fs on purpose (at least so far)
-use/install2/full: use/install2/packages use/install2/kms use/install2/vmguest \
-	use/syslinux/localboot.cfg use/syslinux/ui/menu; @:
+use/install2/full: \
+	use/install2/packages use/install2/vmguest use/install2/tools \
+	use/syslinux/localboot.cfg use/syslinux/ui/menu use/bootloader
+	@$(call add,INSTALL2_PACKAGES,xorg-drv-synaptics)
+	@$(call add,INSTALL2_PACKAGES,xorg-drv-libinput)
+
+# for distributions with their own -stage3 installer part
+use/install2/stage3: use/install2
+	@$(call add,BASE_PACKAGES,installer-$$(INSTALLER)-stage3)
+
+# just an alias, better use its endpoint directly
+use/install2/fonts: use/fonts/install2; @:
 
 # see also use/vmguest
 use/install2/vmguest: use/install2/kvm use/install2/vbox use/install2/vmware; @:
@@ -33,10 +43,6 @@ use/install2/repo: use/install2
 use/install2/net: use/install2
 	@$(call add,INSTALL2_PACKAGES,curl)
 
-# modern free xorg drivers for mainstream hardware require KMS support
-use/install2/kms: use/stage2/kms
-	@$(call add,BASE_KMODULES_REGEXP,drm.*)
-
 # see also use/vmguest/kvm; qxl included in xorg pkglist
 use/install2/kvm:
 	@$(call add,INSTALL2_PACKAGES,spice-vdagent xorg-drv-qxl)
@@ -44,12 +50,13 @@ use/install2/kvm:
 # virtualbox guest support for installer
 use/install2/vbox:
 	@$(call add,STAGE1_KMODULES,virtualbox-addition vboxguest)
+	@$(call add,INSTALL2_PACKAGES,xorg-drv-vboxvideo)
 
 # see also use/vmguest/vmware
 use/install2/vmware:
 	@$(call add,STAGE1_KMODULES,vmware)
 	@$(call add,STAGE1_KMODULES,scsi)	# mptspi in led-ws
-	@$(call add,INSTALL2_PACKAGES,xorg-drv-vmware)
+	@$(call add,INSTALL2_PACKAGES,xorg-drv-vmware xorg-drv-vmmouse)
 
 # NB: sort of conflicts with use/install2/cleanup/vnc
 use/install2/vnc:
@@ -67,6 +74,14 @@ use/install2/jfs:
 use/install2/reiserfs:
 	@$(call add,SYSTEM_PACKAGES,reiserfsprogs)
 
+# prepare bootloader for software suspend (see also live)
+use/install2/suspend:
+	@$(call add,INSTALL2_PACKAGES,installer-feature-desktop-suspend-stage2)
+
+# extras
+use/install2/tools:
+	@$(call add,INSTALL2_PACKAGES,pxz)
+
 # when VNC installation is less welcome than a few extra megs
 use/install2/cleanup/vnc:
 	@$(call add,INSTALL2_CLEANUP_PACKAGES,x11vnc xorg-xvfb)

features.in/install2/install2/image-scripts.d/90-install2-cleanup-bin

@@ -0,0 +1,8 @@
+#!/bin/sh
+
+# purge outstanding binaries (up to 1.5M each)
+rm -f /sbin/{sash,sln,tc}
+rm -f /usr/bin/{openssl,ipv6log*}
+rm -f /bin/ipv6calc
+
+:

features.in/install2/install2/image-scripts.d/90-install2-cleanup-drivers

@@ -30,7 +30,8 @@ rm -rf /lib/modules/*/kernel/drivers/char/watchdog
 rm -rf /lib/modules/*/kernel/drivers/cpufreq
 rm -rf /lib/modules/*/kernel/drivers/edac
 rm -rf /lib/modules/*/kernel/drivers/gpio
-rm -rf /lib/modules/*/kernel/drivers/hwmon
+# NB: leave hwmon.ko
+rm -rf /lib/modules/*/kernel/drivers/hwmon/[^h]
 rm -rf /lib/modules/*/kernel/drivers/infiniband	###
 rm -rf /lib/modules/*/kernel/drivers/input/{gameport,joy*}
 rm -rf /lib/modules/*/kernel/drivers/isdn

features.in/kernel/config.mk

@@ -14,5 +14,11 @@ use/kernel/net:
 	@$(call add,THE_KMODULES,e1000e igb)
 	@$(call add,MAIN_KMODULES,r8168 rtl8168)
 
-use/kernel/wireless:
+use/kernel/wireless: use/firmware/wireless
 	@$(call add,THE_KMODULES,bcmwl ndiswrapper)
+
+use/kernel/laptop: use/firmware/laptop
+	@$(call add,KMODULES,omnibook tp_smapi)
+
+use/kernel/desktop:
+	@$(call add,KMODULES,lirc v4l)

features.in/l10n/stage1/modules.d/50-l10n

@@ -0,0 +1,6 @@
+# l10n
+nls_base.ko
+nls_cp866.ko
+nls_koi8-r.ko
+nls_utf8.ko
+#

features.in/live/README

@@ -7,3 +7,15 @@
 при появлении необходимости обойтись без него можно
 временно продублировать содержимое цели и сообщить
 о таком случае.
+
+Дополнительно обрабатываемые переменные:
+
+* LIVE_REPO
+** позволяет выбрать и включить зеркало репозитория
+** значение: http/alt (по умолчанию) либо протокол/зеркало
+** см. тж. /etc/apt/sources.list.d/, проверьте наличие нужного!
+
+* LIVE_CLEANUP_KDRIVERS
+** перечисляет префиксы каталогов драйвров ядра для удаления
+** значение: пусто (по умолчанию) или список через пробел
+** см. config.mk

features.in/live/config.mk

@@ -12,16 +12,19 @@ _OFF = anacron blk-availability bridge clamd crond dhcpd dmeventd dnsmasq \
 
 # copy stage2 as live
 # NB: starts to preconfigure but doesn't use/cleanup yet
-use/live: use/stage2 sub/rootfs@live sub/stage2@live \
-	use/services use/deflogin/live
+use/live: use/stage2 sub/rootfs@live sub/stage2@live use/services
 	@$(call add_feature)
-	@$(call add,CLEANUP_PACKAGES,'installer*')
+	@$(call add,CLEANUP_BASE_PACKAGES,'installer*')
 	@$(call add,DEFAULT_SERVICES_ENABLE,$(_ON))
 	@$(call add,DEFAULT_SERVICES_DISABLE,$(_OFF))
 	@$(call add,CONTROL,rpcbind:local)
+	@$(call xport,LIVE_CLEANUP_KDRIVERS)
 
-use/live/base: use/live use/net use/syslinux/ui/menu
-	@$(call add,LIVE_LISTS,$(call tags,base && (live || network)))
+use/live/.base: use/live use/syslinux/ui/menu
+	@$(call add,LIVE_LISTS,$(call tags,base live))
+
+use/live/base: use/live/.base use/net use/deflogin/live
+	@$(call add,LIVE_LISTS,$(call tags,base network))
 
 # rw slice, see http://www.altlinux.org/make-initrd-propagator and #28289
 ifeq (,$(EFI_BOOTLOADER))
@@ -32,8 +35,7 @@ use/live/rw: use/live; @:
 endif
 
 # graphical target (not enforcing xorg drivers or blobs)
-use/live/x11: use/live/base use/syslinux/localboot.cfg \
-	use/deflogin/desktop use/x11-autologin use/sound \
+use/live/x11: use/live/base use/deflogin/desktop use/x11-autologin use/sound \
 	use/fonts/otf/adobe use/fonts/otf/mozilla +power +efi
 	@$(call add,LIVE_LISTS,$(call tags,desktop && (live || network)))
 	@$(call add,LIVE_LISTS,$(call tags,base l10n))
@@ -42,7 +44,8 @@ use/live/x11: use/live/base use/syslinux/localboot.cfg \
 # this target specifically pulls free xorg drivers in (and a few more bits);
 # a browser is requested too, the recommended one can be overridden downstream
 use/live/desktop: use/live/x11 use/x11/xorg use/x11/wacom \
-	use/l10n use/browser/firefox/live use/xdg-user-dirs/deep +vmguest; @:
+	use/l10n use/browser/firefox/live use/xdg-user-dirs/deep \
+	use/syslinux/localboot.cfg +vmguest; @:
 
 # preconfigure apt for both live and installed-from-live systems
 use/live/repo: use/live
@@ -82,4 +85,24 @@ use/live/hooks: use/live
 use/live/ru: use/live use/l10n/default/ru_RU; @:
 
 use/live/sound: use/live
-	@$(call add,LIVE_PACKAGES,amixer alsa-utils aplay udev-alsa)
+	@$(call add,LIVE_LISTS,sound/base)
+
+# prepare bootloader for software suspend (see also install2)
+use/live/suspend: use/live
+	@$(call add,LIVE_PACKAGES,installer-feature-desktop-suspend-stage2)
+
+# deny network/local drive access for security reasons
+use/live/privacy: use/services use/memclean use/deflogin
+	@$(call add,DEFAULT_SERVICES_ENABLE,livecd-nodisks)
+	@$(call add,LIVE_PACKAGES,livecd-nodisks)
+	@$(call add,LIVE_CLEANUP_KDRIVERS,kernel/net/)
+	@$(call add,LIVE_CLEANUP_KDRIVERS,kernel/drivers/net/)
+	@$(call add,LIVE_CLEANUP_KDRIVERS,kernel/drivers/ata/)
+	@$(call add,LIVE_CLEANUP_KDRIVERS,kernel/drivers/scsi/)
+	@$(call add,LIVE_CLEANUP_KDRIVERS,kernel/drivers/block/)
+	@$(call add,LIVE_CLEANUP_KDRIVERS,kernel/drivers/cdrom/)
+	@$(call add,LIVE_CLEANUP_KDRIVERS,kernel/drivers/firewire/)
+	@$(call add,LIVE_CLEANUP_KDRIVERS,kernel/drivers/bluetooth/)
+	@$(call set,STAGE1_MODLISTS,stage2-ata stage2-drm stage2-hid)
+	@$(call add,STAGE1_MODLISTS,stage2-mmc stage2-usb)
+	@$(call add,USERS,altlinux:::)

features.in/live/generate.mk

@@ -5,7 +5,7 @@ ifdef BUILDDIR
 include $(BUILDDIR)/distcfg.mk
 
 ifndef HOMEPAGE
-HOMEPAGE = http://www.altlinux.org/
+HOMEPAGE = http://wiki.altlinux.org/
 endif
 
 ifndef HOMENAME

features.in/live/live/image-scripts.d/60-apt

@@ -6,5 +6,5 @@
 PROTO="${GLOBAL_LIVE_REPO%/*}"	# http, ftp, rsync
 MIRROR="${GLOBAL_LIVE_REPO#*/}"	# alt, heanet, kiev, yandex, ...
 
-sed -i "s,^#\(rpm \[alt\] ${PROTO:-http}.*\),\1," \
+sed -i "s,^#\(rpm \[.*\] ${PROTO:-http}.*\),\1," \
 	"/etc/apt/sources.list.d/${MIRROR:-alt}.list"

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

@@ -0,0 +1,7 @@
+#!/bin/sh -e
+
+if [ -n "$GLOBAL_LIVE_CLEANUP_KDRIVERS" ]; then
+	for i in $GLOBAL_LIVE_CLEANUP_KDRIVERS; do
+		rm -rf /lib/modules/*/"$i"
+	done
+fi

features.in/live/live/image-scripts.d/99-urw

@@ -0,0 +1,4 @@
+#!/bin/sh
+# URW fonts are responsible for sub-par website text rendering usually...
+
+rm -f /etc/X11/fontpath.d/type1-urw:pri=40

features.in/lowmem/install2/image-scripts.d/85-cleanup-lowmem

@@ -6,7 +6,7 @@ cd /usr/share/fonts/bitmap/misc/ &&
 
 # drop unneeded translation
 # FIXME: whitelist is reasonable
-cd /usr/share/qt4/translations/ &&
+cd /usr/share/qt?/translations/ &&
 	rm -f *_ar* *_cs* *_da* *_de* *_es* *_fa* *_fr* \
 	      *_gl* *_he* *_hu* *_ko* *_pl* \
 	      *_sk* *_sl* *_sv*

features.in/memclean/README

@@ -0,0 +1,2 @@
+Эта фича добавляет и включает очистку освобождаемой памяти
+средствами zmalloc (через LD_PRELOAD).

features.in/memclean/config.mk

@@ -0,0 +1,4 @@
+use/memclean: use/control
+	@$(call add_feature)
+	@$(call add,THE_PACKAGES,libzmalloc)
+	@$(call add,CONTROL,libzmalloc:enabled)

features.in/metadata/lib/50-metadata.mk

@@ -7,7 +7,7 @@ METADIR := files/Metadata
 WHATEVER += metadata
 
 # handle these too
-DOT_BASE += $(BASE_PACKAGES_REGEXP)
+DOT_BASE += $(BASE_PACKAGES_REGEXP) $(THE_PACKAGES_REGEXP)
 
 # args: type, name
 define dump
@@ -15,7 +15,7 @@ if [ -n "$($(2)_$(1))" ]; then \
 	echo -e "\n## $(2)_$(1)"; \
 	case "$(1)" in \
 	PACKAGES) echo "$($(2)_$(1))";; \
-	LISTS) cat $($(2)_$(1));; \
+	LISTS) echo -e "\n# $($(2)_$(1))"; cat $($(2)_$(1));; \
 	esac; \
 fi;
 endef
@@ -34,10 +34,13 @@ metadata-.base:
 	} | sed -re '/^[^[:space:]#]/ s/[[:space:]]+/\n/g' > .base
 
 # see also alterator-pkg (backend3/pkg-install);
-# we only tar up what's up to it
+# we only tar up what's up to it (note that e.g.
+# LIVE_LISTS are needed in the generated profile
+# but not for alterator-pkg)
 metadata: metadata-.base
 	@mkdir -p $(METADIR); \
 	tar -C $(PKGDIR) -cvf - \
-		$(call rlist,$(THE_GROUPS) $(MAIN_GROUPS) .base) \
+		$(call rlist,.base $(call groups2lists)) \
 		$(call rgroup,$(THE_GROUPS) $(MAIN_GROUPS)) \
+		$(call rprofile,$(PKG_PROFILES)) \
 	> $(METADIR)/pkg-groups.tar

features.in/net-eth/config.mk

@@ -1,9 +1,14 @@
 # NB: this is aimed at LiveCD/installer images
-+net-eth: use/net-eth use/stage2/net-eth
++net-eth: use/net-eth use/stage2/net-eth; @:
 
 # see also use/stage2/net-eth; do not depend on it though
 # as stage2-less images need preconfigured networking too
-use/net-eth: use/net
+use/net-eth: use/net/etcnet
+	@$(call add_feature)
+	@$(call xport,NET_ETH)
+	@$(call add,BASE_PACKAGES,udev-rule-generator-net)
+
+use/net-eth/networkd: use/net/networkd
 	@$(call add_feature)
 	@$(call xport,NET_ETH)
 	@$(call add,BASE_PACKAGES,udev-rule-generator-net)
@@ -12,4 +17,7 @@ use/net-eth: use/net
 use/net-eth/dhcp: use/net-eth use/net/dhcp
 	@$(call add,NET_ETH,eth0:dhcp)
 
+use/net-eth/networkd-dhcp: use/net-eth/networkd
+	@$(call add,NET_ETH,eth0:dhcp)
+
 # use e.g. eth0:static:10.0.0.2/24:10.0.0.1 for predefined static configuration

features.in/net-eth/rootfs/image-scripts.d/50-net-eth

@@ -13,26 +13,38 @@ else
 	NMCTL=no
 fi
 
-IFACEDIR="/etc/net/ifaces"
+ETCNET_IFDIR="/etc/net/ifaces"
+SYSTEMD_IFDIR="/etc/systemd/network"
 
-# uses global variables
 write_iface() {
-	dir="$IFACEDIR/$iface"
+	case "$proto" in
+	dhcp)
+		;;
+	static)
+		[ -n "$ipv4addr" ] || fatal "ipv4addr missing"
+		;;
+	*)
+		fatal "unknown proto value: $proto"
+		;;
+	esac
+	[ -d "$ETCNET_IFDIR" ] && write_etcnet_iface ||:
+	[ -d "$SYSTEMD_IFDIR" ] && write_systemd_iface ||:
+}
+
+# these use global variables
+write_etcnet_iface() {
+	dir="$ETCNET_IFDIR/$iface"
 	mkdir -p "$dir"
 	append=
 	case "$proto" in
 	dhcp)
-		append="DHCP_TIMEOUT=3"
+		append="DHCP_TIMEOUT=7"
 		;;
 	static)
-		[ -n "$ipv4addr" ] || fatal "ipv4addr missing"
 		echo "$ipv4addr" > "$dir/ipv4address"
 		[ -z "$ipv4gw" ] ||
 			echo "default via $ipv4gw" > "$dir/ipv4route"
 		;;
-	*)
-		fatal "unknown proto value: $proto"
-		;;
 	esac
 	{
 		echo "TYPE=eth"
@@ -44,6 +56,34 @@ write_iface() {
 	} > "$dir/options"
 }
 
+write_systemd_iface() {
+	case "$proto" in
+	dhcp)
+		echo "[Match]"
+		echo "Name=$iface"
+		echo
+		echo "[Network]"
+		echo "DHCP=yes"
+		echo
+		echo "[DHCP]"
+		echo "UseMTU=yes"
+		echo "UseDomains=yes"
+		echo "UseNTP=yes"
+		echo
+		;;
+	static)
+		echo "[Match]"
+		echo "Name=$iface"
+		echo
+		echo "[Network]"
+		echo "Address=$ipv4addr"
+		[ -z "$ipv4gw" ] ||
+			echo "Gateway=$ipv4gw"
+		echo "LinkLocalAddressing=no"
+		;;
+	esac > "$SYSTEMD_IFDIR/$iface.network"
+}
+
 [ -z "$GLOBAL_NET_ETH" ] ||
 	echo "$GLOBAL_NET_ETH" \
 	| tr ' ' '\n' \

features.in/net-usershares/rootfs/image-scripts.d/85-samba-usershares.sh

@@ -6,7 +6,7 @@
 
 USERSHARES_DIR="/var/lib/samba/usershares"
 USERSHARES_GROUP="sambashare"
-DEFAULT_GROUPS='cdwriter cdrom audio proc radio camera floppy xgrp scanner uucp' ###
+DEFAULT_GROUPS='cdwriter cdrom audio video proc radio camera floppy xgrp scanner uucp'
 GROUPS_FILE="/usr/share/install3/default-groups"
 
 mkdir -p "$USERSHARES_DIR"

features.in/net/config.mk

@@ -2,6 +2,9 @@
 
 use/net: use/services
 	@$(call add_feature)
+	@$(call add,THE_PACKAGES,network-config-subsystem)
+
+use/net/etcnet: use/net
 	@$(call add,THE_PACKAGES,etcnet)
 	@$(call add,DEFAULT_SERVICES_ENABLE,network)
 
@@ -12,6 +15,7 @@ use/net/dhcp: use/net
 use/net/nm: use/net
 	@$(call add,THE_LISTS,$(call tags,base nm))
 	@$(call add,LIVE_PACKAGES,livecd-save-nfs)
+	@$(call add,DEFAULT_SERVICES_ENABLE,network) #  need for NM?
 	@$(call add,DEFAULT_SERVICES_ENABLE,NetworkManager ModemManager)
 	@$(call add,DEFAULT_SERVICES_ENABLE,livecd-save-nfs) # keep interface up
 
@@ -24,3 +28,7 @@ use/net/nm/mmgui: use/net/nm
 use/net/connman: use/net
 	@$(call add,THE_PACKAGES,connman)
 	@$(call add,DEFAULT_SERVICES_ENABLE,connmand connman)
+
+use/net/networkd: use/net
+	@$(call add,THE_PACKAGES,systemd-networkd)
+	@$(call add,DEFAULT_SERVICES_ENABLE,systemd-networkd)

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

@@ -0,0 +1,6 @@
+# net
+kernel/drivers/net/mii.ko
+kernel/drivers/net/phy
+kernel/drivers/net/ethernet
+kernel/drivers/net/usb
+#

features.in/ntp/README

@@ -0,0 +1,4 @@
+Эта фича конфигурирует службу NTP в качестве клиента
+с целью предоставления точного времени в составе LiveCD;
+для установленных систем рекомендуется применение модуля
+alterator-datetime.

features.in/ntp/config.mk

@@ -0,0 +1,8 @@
+use/ntp: use/services
+	@$(call add_feature)
+	@$(call add,THE_PACKAGES,openntpd)
+	@$(call add,DEFAULT_SERVICES_ENABLE,ntpd)
+
+use/ntp/client: use/ntp
+	@$(call add,NTP_SERVERS,pool.ntp.org)
+	@$(call xport,NTP_SERVERS)

features.in/ntp/rootfs/image-scripts.d/50-ntp

@@ -0,0 +1,10 @@
+#!/bin/sh
+# basic NTP client configuration
+
+. shell-config
+
+CONFIG="/etc/ntpd.conf"
+[ -f "$CONFIG" ] || exit 0
+[ -n "$GLOBAL_NTP_SERVERS" ] || exit 0
+
+shell_config_set "$CONFIG" 'servers' "$GLOBAL_NTP_SERVERS" '[[:space:]]\+' ' '

features.in/plymouth/config.mk

@@ -20,9 +20,10 @@ use/plymouth/stage2: use/plymouth use/branding \
 	@$(call add,STAGE2_BRANDING,bootsplash)
 	@$(call add,STAGE2_BOOTARGS,quiet splash)
 
-use/plymouth/base: use/plymouth/stage2 use/install2/kms
+use/plymouth/base: use/plymouth/stage2
 	@$(call add,INSTALL2_PACKAGES,installer-feature-setup-plymouth)
 	@$(call add,BASE_PACKAGES_REGEXP,make-initrd-plymouth cpio)
+	@$(call add,BASE_KMODULES_REGEXP,drm.*)
 	@$(call add,THE_BRANDING,bootsplash)
 
 use/plymouth/full: use/plymouth/stage2 use/plymouth/base; @:

features.in/repo/config.mk

@@ -2,4 +2,4 @@ use/repo:
 	@$(call add_feature)
 	@$(call add,STAGE1_PACKAGES,gnupg)
 
-use/repo/main: sub/main use/repo
+use/repo/main: sub/main use/repo; @:

features.in/repo/image-scripts.d/90-enable-repo

@@ -2,13 +2,13 @@
 # enable online repos if possible, just quit if anything's wrong
 
 repo_source='/etc/apt/sources.list.d/alt.list'
-host='http://ftp.altlinux.org'
 
 [ -s "$repo_source" ] || exit 0
 
 # regexps from alterator-pkg (via installer-feature-online-repo)
 prefix_re="[[:space:]]*rpm[[:space:]]\+\([^[:space:]]\+[[:space:]]\+\)\?"
-updates_re="${prefix_re}http:\/\/\([^[:space:]]\+\)[[:space:]]*"
+host_re="http:\/\/\([^[:space:]]\+\)[[:space:]]\+"
+updates_re="${prefix_re}${host_re}\([^[:space:]]\+\/\)\?"
 
 # architectures
 host_arch="$(rpm --eval '%_host_cpu')"

features.in/repo/scripts.d/02-pubring

@@ -1,4 +1,9 @@
 #!/bin/sh
 # generate current plaintext rpm pubring representation
+KEYDIR="/usr/lib/alt-gpgkeys"
 
-gpg --export --armor --homedir=/usr/lib/alt-gpgkeys >$WORKDIR/RPM-GPG-KEY
+if [ -d "$KEYDIR" ]; then
+	gpg --export --armor --homedir="$KEYDIR" >$WORKDIR/RPM-GPG-KEY
+else
+	echo "** warning: skipping RPM-GPG-KEY generation, $KEYDIR missing" >&2
+fi

features.in/rescue/config.mk

@@ -5,7 +5,7 @@ use/rescue/.base: use/stage2 sub/stage2@rescue
 	@$(call add,RESCUE_LISTS,openssh)
 
 use/rescue/base: use/rescue/.base
-	@$(call add,RESCUE_PACKAGES,pciutils)
+	@$(call add,RESCUE_PACKAGES,pciutils nfs-utils os-prober)
 	@$(call add,RESCUE_LISTS,\
 		$(call tags,base && (rescue || network || security || archive)))
 

features.in/rescue/rescue/image-scripts.d/50-openssh

@@ -0,0 +1,19 @@
+#!/bin/sh
+# re-enable insecure DSA and DH SHA1 support
+# see also: http://www.openssh.com/legacy.html
+
+# any openssh at all?
+[ -d /etc/openssh ] && cd /etc/openssh || exit 0
+
+# is it p7 or earlier (which won't grok the lines added below)?
+[ $(rpmvercmp $(rpmquery --qf='%{VERSION}' openssh-common) 7.0) != "-1" ] ||
+	exit 0
+
+KEY_TYPES="PubkeyAcceptedKeyTypes +ssh-dss,ssh-dss-cert-v01@openssh.com"
+KEX_ALGOS="KexAlgorithms +diffie-hellman-group1-sha1"
+
+grep -qs "^$KEY_TYPES" sshd_config || echo "$KEY_TYPES" >> sshd_config
+grep -qs "^$KEY_TYPES" ssh_config  || echo "$KEY_TYPES" >> ssh_config
+grep -qs "^$KEX_ALGOS" ssh_config  || echo "$KEX_ALGOS" >> ssh_config
+
+:

features.in/rescue/rescue/image-scripts.d/98-init-rescue

@@ -10,11 +10,14 @@ if [ -x /etc/rc.d/init.d/rpcbind ]; then
 fi
 
 # remove unwanted startup scripts
+echo "** removing initscripts:"
 find /etc/rc.d/rc{2,3,4,5}.d/ -type l -name 'S*' \
+	-not -name '*livecd-net-eth' \
 	-not -name '*logd' \
 	-not -name '*network' \
 	-not -name '*rpcbind' \
 	-not -name '*random' \
+	-not -name '*rescue-remote' \
 	-not -name '*sysreport' \
 	-not -name '*udev*' \
 	-delete -print