0.7.3-alt1

- arm builds

.gear/mkimage-profiles.spec

@@ -1,6 +1,6 @@
 Name: mkimage-profiles
-Version: 0.6.2.2
+Version: 0.7.3
-Release: alt0.M60T.1
+Release: alt1
 
 Summary: ALT Linux based distribution metaprofile
 License: GPLv2+
@@ -61,11 +61,38 @@ cp -a * %buildroot%mpdir
 %doc README QUICKSTART
 
 %changelog
-* Mon Feb 02 2015 Michael Shigorin <mike@altlinux.org> 0.6.2.2-alt0.M60T.1
+* Mon Jul 09 2012 Michael Shigorin <mike@altlinux.org> 0.7.3-alt1
-- backported pkg/lists fix (and the commit before it)
+- arm builds
 
-* Mon Mar 24 2014 Michael Shigorin <mike@altlinux.org> 0.6.2.1-alt0.M60T.1
+* Mon Jul 02 2012 Michael Shigorin <mike@altlinux.org> 0.7.2-alt1
-- altlinux-t6-server-ovz
+- simply fixes
+
+* Mon Jun 25 2012 Michael Shigorin <mike@altlinux.org> 0.7.1-alt1
+- vm improvements and assorted tweaks/fixes
+
+* Mon Jun 18 2012 Michael Shigorin <mike@altlinux.org> 0.7.0-alt1
+- new features:
+  + initial build-vm
+  + plymouth
+
+* Mon May 28 2012 Michael Shigorin <mike@altlinux.org> 0.6.8-alt1
+- minor bugfixes
+
+* Mon May 21 2012 Michael Shigorin <mike@altlinux.org> 0.6.7-alt1
+- docs updates
+
+* Mon May 14 2012 Michael Shigorin <mike@altlinux.org> 0.6.6-alt1
+- build helpers refactored
+- initial frontend support
+
+* Mon May 07 2012 Michael Shigorin <mike@altlinux.org> 0.6.5-alt1
+- branding feature
+
+* Mon Apr 23 2012 Michael Shigorin <mike@altlinux.org> 0.6.4-alt1
+- simply better (tm)
+
+* Mon Apr 09 2012 Michael Shigorin <mike@altlinux.org> 0.6.3-alt1
+- massive squashfs tuning
 
 * Mon Apr 02 2012 Michael Shigorin <mike@altlinux.org> 0.6.2-alt1
 - better live-webkiosk and initial live-flightgear

.gear/tags/500eea7e501647e4e9fb90f59064539392ebc25c

@@ -1,6 +0,0 @@
-object 71c4404c4e405b547040f81931c1b8a7ea82134b
-type commit
-tag v0.6.2.1
-tagger Michael Shigorin <mike@altlinux.org> 1395691214 +0400
-
-altlinux-t6-server-ovz

.gear/tags/f108c3daaab553777186eb3d12e6a850516417d4

@@ -0,0 +1,6 @@
+object b4560c7aee6082b1a8f33981ee5543339e4f1ddb
+type commit
+tag v0.7.2
+tagger Michael Shigorin <mike@altlinux.org> 1341235133 +0300
+
+simply fixes

.gear/tags/list

@@ -1 +1 @@
-500eea7e501647e4e9fb90f59064539392ebc25c v0.6.2.1
+f108c3daaab553777186eb3d12e6a850516417d4 v0.7.2

Makefile

@@ -2,34 +2,47 @@
 # iterate over multiple goals/arches,
 # collect proceedings
 
+# preferences
+-include $(HOME)/.mkimage/profiles.mk
+
 # for immediate assignment
 ifndef ARCHES
 ifdef ARCH
 ARCHES := $(ARCH)
 else
-ARCHES := $(shell arch | sed 's/i686/i586/')
+ARCHES := $(shell arch | sed 's/i686/i586/; s/armv.*/arm/')
 endif
 endif
 export ARCHES
 
+export PATH := $(CURDIR)/bin:$(PATH)
+
 # supervise target tracing; leave stderr alone
 ifdef REPORT
 export REPORT_PATH := $(shell mktemp --tmpdir mkimage-profiles.report.XXXXXXX)
-POSTPROC := | bin/report-filter > $(REPORT_PATH)
+POSTPROC := | report-filter > $(REPORT_PATH)
 endif
 
 # recursive make considered useful for m-p
 MAKE += -r --no-print-directory
 
-.PHONY: clean distclean help
+DIRECT_TARGETS := clean distclean check help help/distro help/ve help/vm
-clean distclean help:
+.PHONY: $(DIRECT_TARGETS)
+$(DIRECT_TARGETS):
 	@$(MAKE) -f main.mk $@
 
 export NUM_TARGETS := $(words $(MAKECMDGOALS))
 
+# for pipefail
+SHELL = /bin/bash
+
+# don't even consider remaking a configuration file
+.PHONY: $(HOME)/.mkimage/profiles.mk
+
 # real targets need real work
 %:
 	@n=1; \
+	set -o pipefail; \
 	say() { echo "$$@" >&2; }; \
 	if [ "$(NUM_TARGETS)" -gt 1 ]; then \
 		n="`echo $(MAKECMDGOALS) \
@@ -41,7 +54,10 @@ export NUM_TARGETS := $(words $(MAKECMDGOALS))
 	for ARCH in $(ARCHES); do \
 		if [ "$$ARCH" != "$(firstword $(ARCHES))" ]; then say; fi; \
 		say "** ARCH: $$ARCH" >&2; \
-		$(MAKE) -f main.mk ARCH=$$ARCH $@ $(POSTPROC); \
+		if $(MAKE) -f main.mk ARCH=$$ARCH $@ $(POSTPROC); then \
-		$(MAKE) -f reports.mk ARCH=$$ARCH; \
+			if [ -n "$$REPORT" ]; then \
+				$(MAKE) -f reports.mk ARCH=$$ARCH; \
+			fi; \
+		fi; \
 	done; \
 	if [ "$$n" -lt "$(NUM_TARGETS)" ]; then say; fi

QUICKSTART

@@ -1,3 +1,6 @@
+English quickstart: make server-mini.iso; see also
+http://en.altlinux.org/Hasher (a large tmpfs is nice).
+
 требуется
 ~~~~~~~~~
 - ALT Linux 6.0 или выше (возможна адаптация "вниз")
@@ -18,13 +21,13 @@
 # apt-get install mkimage hasher git-core
 # hasher-useradd USER
 
-- от имени пользователя (после повторного входа):
+- от имени указанного пользователя (после повторного входа):
 $ git config --global user.email "my@email"
 $ git config --global user.name "My Name"
 $ mkdir ~/out
 
-- тестовая сборка (см. тж. lib/distro.mk, doc/variables.txt):
+- тестовая сборка (см. тж. lib/distro.mk, doc/params.txt):
-$ make distro/icewm.iso
+$ make icewm.iso
 
 ссылки
 ~~~~~~

README

@@ -1,15 +1,16 @@
 Welcome to mkimage-profiles!
 
-English quickstart: make server-mini.iso;
-see http://en.altlinux.org/Hasher (and a large tmpfs).
-
 Configurables: ~/.mkimage/profiles.mk;
-see doc/variables.txt and conf.d/README
+see doc/params.txt and conf.d/README
 
 License: GPLv2+, see COPYING
 
 Most docs are in Russian, welcome to learn it or ask for English.
-См. тж. http://www.altlinux.org/Mkimage/Profiles/m-p
+
+См. тж. http://www.altlinux.org/Mkimage/Profiles/m-p и doc/*.txt:
+- params.txt: переменные, указываемые при запуске сборки
+- features.txt: обзор подключаемых особенностей
+- pkglists.txt: формирование состава образа
 
 Задача:
 - конфигурирование и создание образов на базе ALT Linux
@@ -32,8 +33,8 @@ Most docs are in Russian, welcome to learn it or ask for English.
 - сборка образа
 
 Объекты:
-- дистрибутивы и виртуальные окружения:
+- дистрибутивы и виртуальные среды/машины:
-  + описываются в conf.d/*.mk или соответственно lib/{distro,ve}.mk
+  + описываются в conf.d/*.mk или соответственно lib/{distro,ve,vm}.mk
   + могут основываться на предшественниках, расширяя их
   + дистрибутивы также:
     - включают один или более субпрофилей по надобности
@@ -43,7 +44,7 @@ Most docs are in Russian, welcome to learn it or ask for English.
   + базовые комплекты помещены в подкаталогах под sub.in/;
     их наборы скриптов могут расширяться фичами
 - фичи:
-  + список собирается в $(FEATURES)
+  + накопительный список собирается в $(FEATURES)
   + законченные блоки функциональности (или наборы таковых)
   + описываются в индивидуальных features.in/*/config.mk
   + могут требовать другие фичи, а также субпрофили
@@ -58,4 +59,4 @@ Most docs are in Russian, welcome to learn it or ask for English.
   + указанный явно,
   + либо ~/out/ (если возможно),
   + или $(BUILDDIR)/out/ иначе
-- формируются отчёты, если запрошены (REPORTS)
+- формируются отчёты, если запрошены (REPORT)

bin/tar2vm

@@ -0,0 +1,131 @@
+#!/bin/bash -e
+
+. shell-error
+
+if [ $# -lt 2 ]; then
+	fatal "error: tar2vm needs at least two arguments"
+fi
+
+# this needs env_keep sudo setup to actually work
+if [ -n "$GLOBAL_BUILDDIR" ]; then
+	WORKDIR="$GLOBAL_BUILDDIR/vmroot"
+else
+	WORKDIR="$(mktemp --tmpdir -d vmroot-XXXXX)"
+fi
+
+[ -n "$WORKDIR" ] || fatal "couldn't come up with suitable WORKDIR"
+
+[ -n "$GLOBAL_DEBUG" ] || message "WORKDIR: $WORKDIR"
+
+# a tarball containing chroot with a kernel
+TAR="$1"
+[ -s "$TAR" ] || fatal "source tarball doesn't really exist"
+
+# a path to the image to be generated
+IMG="$2"
+[ -d "$(dirname "$IMG")" ] || fatal "target directory doesn't exist"
+
+# image size in bytes (256M is a fallback)
+TARSIZE="$(stat -Lc %s "$TAR")"
+DEFSIZE="$((3 * $TARSIZE / 2))"
+DISKSIZE="${3:-${DEFSIZE:-268435456}}"
+# ...and in megabytes
+DISKSIZEM="$(($DISKSIZE / 1048576))"
+
+# tested to work: ext[234], jfs
+ROOTFSTYPE="${4:-ext4}"
+
+# single root partition hardwired so far,
+# add another image for swap if needed
+ROOTDEV="/dev/sda1"
+
+# last preparations...
+for i in losetup parted kpartx mkfs."$ROOTFSTYPE"; do
+	if ! type -t "$i" >&/dev/null; then
+		fatal "$i required but not found"
+	fi
+done
+
+LOOPDEV="$(losetup --find)"
+ROOTFS="$WORKDIR/chroot"
+
+exit_handler()
+{
+	rc=$?
+	if [ -n "$ROOTFS" ]; then
+		umount "$ROOTFS"{/dev,/proc,/sys,}
+		if [ -n "$LOOPDEV" ]; then
+			kpartx -d "$LOOPDEV"
+			losetup --detach "$LOOPDEV"
+		fi
+		rm -r -- "$ROOTFS"
+		rmdir -- "$WORKDIR"
+	fi
+	exit $rc
+}
+
+trap exit_handler EXIT
+
+# prepare disk image and a filesystem inside it
+rm -f -- "$IMG"
+dd if=/dev/zero of="$IMG" conv=notrunc \
+	bs=1 count=1 seek="$(($DISKSIZE - 1))"
+losetup "$LOOPDEV" "$IMG"
+
+parted --script "$LOOPDEV" mklabel msdos
+parted --script "$LOOPDEV" mkpart primary ext2 1 "$DISKSIZEM"
+
+kpartx -a "$LOOPDEV"
+LOOPDEV1="/dev/mapper/$(basename "$LOOPDEV")p1"
+
+mkfs."$ROOTFSTYPE" "$LOOPDEV1"
+
+# mount and populate it
+mkdir -pm755 "$ROOTFS"
+mount "$LOOPDEV1" "$ROOTFS"
+tar -C "$ROOTFS" --numeric-owner -xf "$TAR"
+for i in /dev /proc /sys; do mount --bind "$i" "$ROOTFS$i"; done
+
+# NB: different storage modules might be needed for non-kvm
+echo "$LOOPDEV1 / $ROOTFSTYPE defaults 1 1" >> "$ROOTFS/etc/fstab"
+echo "MODULES_PRELOAD=sd_mod ata_piix $ROOTFSTYPE" >> "$ROOTFS/etc/initrd.mk"
+
+KERNEL="$(readlink $ROOTFS/boot/vmlinuz | sed 's,vmlinuz-,,')"
+chroot "$ROOTFS" make-initrd -k "$KERNEL"
+
+sed -i "s,$LOOPDEV1,$ROOTDEV," "$ROOTFS/etc/fstab"
+
+# configure and install bootloader
+REGEXP='^([0-9]+) heads, ([0-9]+) sectors/track, ([0-9]+) cylinders.*$'
+set -- $(fdisk -l "$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\"
+  label=linux"
+
+cat > "$ROOTFS"/etc/lilo-loop.conf << EOF
+boot=$LOOPDEV
+disk=$LOOPDEV
+  bios=0x80
+  heads=$1
+  sectors=$2
+  cylinders=$3
+  partition=$LOOPDEV1
+  start=63
+$LILO_COMMON
+EOF
+
+chroot "$ROOTFS" lilo -C /etc/lilo-loop.conf
+
+cat > "$ROOTFS"/etc/lilo.conf << EOF
+boot=${ROOTDEV%[0-9]*}
+$LILO_COMMON
+EOF
+
+if [ -n "$SUDO_USER" ]; then
+	chown "$SUDO_USER" "$IMG" "$ROOTFS" "$WORKDIR"
+fi

conf.d/README

@@ -10,25 +10,49 @@
 
 Попросту говоря, copy-paste -- тревожный признак.
 
-По переменным:
+По переменным (см. тж. ../doc/vars-conf.txt):
+
+- для пользовательского окружения (live, main) предназначены
+  THE_PACKAGES, THE_LISTS, THE_GROUPS, THE_PACKAGES_REGEXP
+
+- для "обычного общего" (live, main, rescue) есть COMMON_PACKAGES
+  (NB: тоже попадают в базовую установку)
+
 - SYSTEM_PACKAGES стоит применять крайне осторожно -- эти пакеты попадут
   во все стадии, в том числе в образ чувствительной к объёму install2
   (в stage1 -- только в инструментальный чрут); применяйте для того,
   что обязано быть и в инсталяторе, и в готовой системе
-- для "обычного общего" (live, main, rescue) есть COMMON_PACKAGES
+
-  (NB: попадают в базовую систему)
+- для направленного действия служат:
-- для "пользовательского" (live, main) есть THE_GROUPS, THE_LISTS
+  + STAGE1_PACKAGES, STAGE1_PACKAGES_REGEXP (первая стадия загрузки)
-  и THE_PACKAGES
+  + STAGE2_PACKAGES (инсталятор и спасательная/"живая" система)
+  + INSTALL2_PACKAGES (инсталятор)
+  + BASE_PACKAGES, BASE_LISTS, BASE_PACKAGES_REGEXP (базовая система)
+  + MAIN_PACKAGES, MAIN_LISTS, MAIN_PACKAGES_REGEXP (дополнительные пакеты)
+  + LIVE_PACKAGES, LIVE_LISTS, LIVE_PACKAGES_REGEXP ("живая" система)
+
 - аналогично по модулям ядра:
+  + THE_KMODULES попадут в "пользовательскую" среду (live, main)
   + STAGE1_KMODULES доступны в производных от stage2 (install2, live, rescue)
   + BASE_KMODULES попадут в установку по умолчанию
   + MAIN_KMODULES будут доступны для установки с носителя
   + LIVE_KMODULES предназначены для LiveCD/LiveFlash
-  + THE_KMODULES попадут в "пользовательские" окружения
+
-    (live и установленную систему)
+Не стоит бояться такого разнообразия, для большинства задач достаточно THE_*.
 
 По подстановкам:
 - $(VAR) подставляются перед их записью в $(CONFIG), который distcfg.mk
 - $$(VAR) раскрываются позже, при включении $(CONFIG) и востребовании
   значений; в этом случае их значения могут изменяться до окончания
   конфигурации, а также зависеть от значений других переменных
+
+По спискам пакетов:
+- на этапе экспериментирования можно забивать прямо в описание образа
+- при фиксации состояния стоит воспользоваться существующими списками,
+  а дополнительные оформить как можно более чётко обособленными по тем
+  задачам, для решения которых они и подобраны
+- повторяющиеся логически связанные группы списков может иметь смысл
+  выделить в фичу (см., например, power или x11)
+- если явной фичи не наблюдается, но у группы дистрибутивов намечается
+  заметная общая часть -- её можно выделить в промежуточную цель вида
+  distro/.name, не являющуюся самостоятельно собираемой

conf.d/desktop.mk

@@ -6,13 +6,16 @@ distro/.desktop-base: distro/.installer use/syslinux/ui/vesamenu use/x11/xorg
 
 distro/.desktop-mini: distro/.desktop-base use/x11/xdm +power; @:
 
-distro/.desktop-network: distro/.desktop-mini use/virtualbox/guest
+distro/.desktop-network: distro/.desktop-mini +vmguest
-	@$(call add,BASE_LISTS,$(call tags,(base || desktop) && network))
+	@$(call add,SYSTEM_PACKAGES,fonts-ttf-google-croscore-arimo)
+	@$(call add,BASE_LISTS, \
+		$(call tags,(base || desktop) && (l10n || network)))
 
 distro/icewm: distro/.desktop-network use/lowmem +icewm; @:
 distro/tde: distro/.desktop-mini +tde; @:
 distro/ltsp-tde: distro/tde +ltsp; @:
 distro/ltsp-icewm: distro/icewm +ltsp; @:
 distro/desktop-systemd: distro/icewm use/systemd; @:
+distro/desktop-plymouth: distro/icewm +plymouth; @:
 
 endif

conf.d/live.mk

@@ -9,7 +9,7 @@ distro/rescue: distro/.base use/rescue use/syslinux/ui/menu; @:
 distro/live-systemd: distro/.base use/live/base use/systemd; @:
 
 distro/.live-base: distro/.base use/live/base use/power/acpi/button; @:
-distro/.live-desktop: distro/.base +live use/syslinux/ui/vesamenu; @:
+distro/.live-desktop: distro/.base +live use/plymouth/live; @:
 
 distro/.live-kiosk: distro/.base use/live/base use/live/autologin \
 	use/syslinux/timeout/1 use/cleanup +power
@@ -21,22 +21,24 @@ distro/live-isomd5sum: distro/.base use/live/base use/isomd5sum
 
 distro/live-builder: pkgs := livecd-tmpfs livecd-online-repo mkimage-profiles
 distro/live-builder: distro/.live-base use/dev/mkimage use/dev/repo
+	@$(call set,KFLAVOURS,$(BIGRAM))
 	@$(call add,LIVE_LISTS,$(call tags,base && (server || builder)))
 	@$(call add,LIVE_PACKAGES,zsh sudo)
 	@$(call add,LIVE_PACKAGES,$(pkgs))
 	@$(call add,MAIN_PACKAGES,$(pkgs))
 	@$(call add,MAIN_PACKAGES,syslinux pciids memtest86+ mkisofs)
 
-distro/live-install: distro/.live-base use/syslinux/localboot.cfg
+distro/live-install: distro/.live-base use/live/textinst; @:
-	@$(call add,LIVE_PACKAGES,live-install)
+distro/.livecd-install: distro/.live-base use/live/install; @:
 
 distro/live-icewm: distro/.live-desktop use/live/autologin +icewm; @:
-distro/live-razorqt: distro/.live-desktop +razorqt; @:
+distro/live-razorqt: distro/.live-desktop use/live/autologin +razorqt; @:
-distro/live-tde: distro/.live-desktop use/live/ru +tde; @:
+distro/live-tde: distro/.live-desktop use/live/ru use/live/install +tde; @:
+distro/live-plymouth: distro/.live-base use/plymouth/live; @:
 
 distro/live-rescue: distro/live-icewm
 	@$(call add,LIVE_LISTS,$(call tags,rescue && (fs || live || x11)))
-	@$(call add,LIVE_LISTS, \
+	@$(call add,LIVE_LISTS,openssh \
 		$(call tags,(base || extra) && (archive || rescue || network)))
 
 distro/live-webkiosk-mini: distro/.live-kiosk use/live/hooks use/live/ru
@@ -44,10 +46,33 @@ distro/live-webkiosk-mini: distro/.live-kiosk use/live/hooks use/live/ru
 	@$(call add,LIVE_PACKAGES,livecd-webkiosk)
 	@$(call add,CLEANUP_PACKAGES,'libqt4*' 'qt4*')
 
+# NB: flash/java plugins are predictable security holes
+distro/live-webkiosk-flash: distro/live-webkiosk-mini use/plymouth/live +vmguest
+	@$(call add,LIVE_PACKAGES,mozilla-plugin-adobe-flash)
+	@$(call add,LIVE_PACKAGES,mozilla-plugin-java-1.6.0-sun)
+	@$(call add,LIVE_PACKAGES,alsa-utils udev-alsa)
+
 distro/live-webkiosk: distro/live-webkiosk-mini use/live/desktop; @:
 
 distro/live-flightgear: distro/live-icewm use/live/sound use/x11/3d-proprietary
-	@$(call add,LIVE_PACKAGES,FlightGear fgo)
+	@$(call add,LIVE_PACKAGES,FlightGear fgo input-utils)
 	@$(call try,HOMEPAGE,http://www.4p8.com/eric.brasseur/flight_simulator_tutorial.html)
 
+distro/live-cinnamon: distro/.live-desktop use/live/autologin use/live/ru \
+	use/x11/cinnamon use/x11/3d-proprietary; @:
+
+distro/live-mate: distro/.live-desktop use/live/nodm use/live/ru use/x11/3d-free
+	@$(call add,LIVE_LISTS,$(call tags,(desktop || mobile) && mate))
+
+distro/live-enlightenment: distro/.live-desktop use/live/autologin \
+	use/live/ru use/x11/3d-free
+	@$(call add,LIVE_PACKAGES,enlightenment)
+
+distro/live-gimp: distro/live-icewm use/x11/3d-free use/live/ru
+	@$(call add,LIVE_PACKAGES,gimp tintii immix fim)
+	@$(call add,LIVE_PACKAGES,cvltonemap darktable geeqie rawstudio ufraw)
+	@$(call add,LIVE_PACKAGES,macrofusion python-module-pygtk-libglade)
+	@$(call add,LIVE_PACKAGES,qtfm openssh-clients rsync)
+	@$(call add,LIVE_PACKAGES,design-graphics-sisyphus2)
+
 endif

conf.d/server.mk

@@ -2,7 +2,7 @@
 ifeq (distro,$(IMAGE_CLASS))
 
 distro/.server-base: distro/.installer use/syslinux/ui/menu use/memtest
-	@$(call add,BASE_LISTS,server-base)
+	@$(call add,BASE_LISTS,server-base openssh)
 
 distro/server-nano: distro/.server-base \
 	use/cleanup/x11-alterator use/bootloader/lilo
@@ -17,19 +17,17 @@ distro/server-mini: distro/.server-base use/cleanup/x11-alterator
 		$(call tags,base && (server || network || security || pkg)))
 	@$(call add,BASE_LISTS,$(call tags,extra (server || network)))
 
-distro/server-systemd: distro/server-mini use/systemd use/bootloader/lilo; @:
+distro/server-systemd: distro/server-mini use/systemd
+	@$(call set,KFLAVOURS,std-def)
 
-distro/server-ovz: distro/server-mini use/install2/net \
+distro/server-ovz: distro/server-mini use/install2/net use/hdt use/rescue \
-	use/hdt use/rescue use/firmware/server use/power/acpi/button
+	use/firmware/server use/firmware/wireless use/power/acpi/button
-	@$(call set,INSTALLER,desktop)
 	@$(call set,STAGE1_KFLAVOUR,std-def)
 	@$(call set,KFLAVOURS,std-def ovz-el)
 	@$(call add,BASE_KMODULES,rtl8168 rtl8192)
-	@$(call add,MAIN_KMODULES,bcmwl ndiswrapper)
 	@$(call add,MAIN_KMODULES,ipset ipt-netflow opendpi pf_ring xtables-addons)
 	@$(call add,MAIN_KMODULES,drbd83 kvm)
 	@$(call add,BASE_LISTS,ovz-server)
-	@$(call add,MAIN_LISTS,kernel-wifi)
 	@$(call add,MAIN_GROUPS,dns-server http-server ftp-server kvm-server)
 	@$(call add,MAIN_GROUPS,ipmi mysql-server dhcp-server mail-server)
 	@$(call add,MAIN_GROUPS,monitoring diag-tools)

conf.d/simply.mk

@@ -0,0 +1,11 @@
+# simply images
+
+ifeq (distro,$(IMAGE_CLASS))
+
+distro/live-simply: distro/.livecd-install use/slinux/full
+	@$(call add,THE_LISTS,slinux/live-install)
+
+distro/simply: distro/.installer use/slinux/full
+	@$(call set,INSTALLER,simply-linux)
+
+endif

conf.d/t6.mk

@@ -1,7 +0,0 @@
-# t6 base kits
-
-ifeq (distro,$(IMAGE_CLASS))
-
-distro/altlinux-t6-server-ovz: distro/server-ovz; @:
-
-endif

conf.d/vm.mk

@@ -0,0 +1,13 @@
+# virtual machines
+ifeq (vm,$(IMAGE_CLASS))
+
+# NB: use/x11 employs some installer-feature packages
+vm/icewm: vm/bare use/cleanup/installer use/x11/xdm +icewm; @:
+
+vm/net: vm/bare use/vm-net/dhcp use/vm-ssh; @:
+
+vm/net-static: vm/bare use/vm-net/static use/vm-ssh
+	@$(call set,VM_NET_IPV4ADDR,10.0.2.16/24)
+	@$(call set,VM_NET_IPV4GW,10.0.2.2)
+
+endif

doc/debug.txt

@@ -10,7 +10,7 @@
 
 - build/build.log
   + подробность зависит от значения переменной DEBUG,
-    которую можно передать при запуске make (см. variables.txt);
+    которую можно передать при запуске make (см. params.txt);
   + содержит коммит, из которого происходит сборка, и признак
     "грязности" рабочего каталога при наличии модификаций после
     этого коммита;

doc/features.txt

@@ -1,8 +1,9 @@
 фичи
 ~~~~
 Особенности дистрибутива, не учитываемые в пакетной базе
-или зависящие от переменных времени сборки/установки образа,
+или зависящие от переменных времени сборки/установки образа;
-могут быть оформлены как:
+по необходимости влияют на конфигурацию, приносят с собой
+или запрашивают скрипты, которые могут быть оформлены как:
 
 * scripts.d/ или image-scripts.d/ различных стадий;
 * пакеты installer-feature-*
@@ -27,3 +28,12 @@
 Стоит избегать изменения пакетных умолчаний в случае, когда их
 представляется осмысленным и возможным скорректировать в пакете:
 таким образом они станут более дистрибутивными.
+
+Обратите внимание, что фичи включаются в комплект инкрементально:
+что добавили, то уже не убрать; поэтому при необходимости следует
+выделять промежуточные цели сборки, собирающие необходимые фичи
+и оставляющие те, по которым есть расхождения, на включение ближе
+к конечной дистрибутивной цели.
+
+Соглашение по именованию таково, что цели use/ФИЧА и use/ФИЧА/...
+определяются в файле features.in/ФИЧА/config.mk и только в нём.

doc/params.txt

@@ -10,13 +10,13 @@
 
 - ARCH
   + задаёт целевую архитектуру образов
-  + значение: пусто (по умолчанию авто), i586 или x86_64
+  + значение: пусто (по умолчанию авто), i586, x86_64 или arm
   + см. ../lib/build.mk
 
 - ARCHES
-  + задаёт набор целевых архитектур образов
+  + задаёт набор целевых архитектур при параметрическом задании APTCONF
   + значение: пусто (по умолчанию авто) либо список через пробел
-  + см. ../Makefile
+  + см. ../Makefile, profiles.mk.sample
 
 - BELL
   + подаёт сигнал после завершения сборки
@@ -39,7 +39,7 @@
   + см. ../lib/log.mk
 
 - CHECK
-  + включает режим проверки сборки конфигурации
+  + включает режим проверки сборки конфигурации (без сборки образа)
   + значение: пусто (по умолчанию) либо любая строка
   + см. ../lib/build.mk
 
@@ -71,16 +71,35 @@
   + см. ../lib/build.mk
 
 - REPORT
-  + запрашивает создание отчёта о собранном образе
+  + запрашивает создание отчётов о собранном образе
   + значение: пусто (по умолчанию) либо любая строка
   + NB: в силу специфики обработки передаётся только явно
   + см. ../Makefile, ../report.mk, ../lib/report.mk
 
+- ROOTPW
+  + устанавливает пароль root по умолчанию для образов виртуальных машин
+  + значение: пусто (по умолчанию root) либо строка
+  + см. ../features.in/build-vm/image-scripts.d/00root
+
 - SAVE_PROFILE
   + сохраняет архив сгенерированного профиля в .disk/
   + значение: пусто (по умолчанию) либо любая строка
   + см. ../image.in/Makefile
 
+- SQUASHFS
+  + определяет характер сжатия squashfs для stage2
+  + значение:
+    - пусто (по умолчанию) либо normal: xz
+    - tight: xz с -Xbcj по платформе (лучше, но дольше -- подбор в два прохода)
+    - fast: gzip/lzo (быстрее запаковывается и распаковывается, меньше степень)
+  + см. ../features.in/stage2/stage1/scripts.d/03-test-kernel
+
+- SORTDIR
+  + дополнительно структурирует каталог собранных образов
+  + значение: пусто (по умолчанию) либо строка
+    - например, '$(IMAGE_NAME)/$(DATE)'
+  + см. ../image.in/Makefile
+
 пример
 ~~~~~~
 make DEBUG=1 CLEAN=1 distro/syslinux.iso

doc/pkglists.txt

@@ -0,0 +1,50 @@
+списки пакетов
+~~~~~~~~~~~~~~
+Состав пакетной базы субпрофилей определяется значенями
+следующих переменных профиля (см. тж. ../conf.d/README):
+
+- main: пакетная база для установки
+  + sub.in/main/Makefile, features.in/*/main/lib/*.mk
+  + THE_LISTS, BASE_LISTS, MAIN_LISTS
+  + THE_GROUPS, MAIN_GROUPS
+  + THE_PACKAGES, BASE_PACKAGES, MAIN_PACKAGES,
+    SYSTEM_PACKAGES, COMMON_PACKAGES
+  + THE_PACKAGES_REGEXP, BASE_PACKAGES_REGEXP, MAIN_PACKAGES_REGEXP
+  + THE_KMODULES, BASE_KMODULES, MAIN_KMODULES, BASE_KMODULES_REGEXP
+    - KFLAVOURS
+
+- stage2: общая часть installer, live, rescue
+  + sub.in/stage2/Makefile, features.in/*/stage2/lib/*.mk
+  + SYSTEM_PACKAGES, STAGE2_PACKAGES
+  + STAGE1_KMODULES, STAGE1_KMODULES_REGEXP,
+    STAGE2_KMODULES, STAGE2_KMODULES_REGEXP
+    - STAGE1_KFLAVOUR или последний из KFLAVOURS
+
+- installer: компактная "живая" система, содержащая только инсталятор
+  + см. stage2
+  + features.in/install2/install2/stage2cfg.mk,
+    features.in/*/install2/lib/*.mk
+  + INSTALL2_PACKAGES
+
+- live: пользовательский LiveCD (может содержать также инсталятор)
+  + см. stage2
+  + features.in/live/live/stage2cfg.mk,
+    features.in/*/live/lib/*.mk
+  + THE_LISTS, LIVE_LISTS
+  + THE_GROUPS, LIVE_GROUPS
+  + THE_PACKAGES, LIVE_PACKAGES, COMMON_PACKAGES
+  + THE_PACKAGES_REGEXP, LIVE_PACKAGES_REGEXP
+  + THE_KMODULES, LIVE_KMODULES
+
+- rescue: спасательный LiveCD
+  + см. stage2
+  + features.in/rescue/rescue/stage2cfg.mk
+  + RESCUE_PACKAGES, COMMON_PACKAGES
+  + RESCUE_LISTS
+
+- stage1: ядро и загрузчик второй стадии
+  + sub.in/stage1/Makefile, features.in/*/stage1/lib/*.mk
+  + STAGE1_PACKAGES, SYSTEM_PACKAGES
+  + STAGE1_PACKAGES_REGEXP
+  + STAGE1_KMODULES_REGEXP
+    - STAGE1_KFLAVOUR или последний из KFLAVOURS

doc/vm.txt

@@ -0,0 +1,24 @@
+сборка образов виртуальных машин
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ВНИМАНИЕ: заключительная операция создания образа жёсткого диска
+из архива с содержимым корневой файловой системы требует доступа
+к sudo и разрешения на выполнение скрипта bin/tar2vm в корневом
+каталоге метапрофиля при установке mkimage-profiles из пакета.
+
+Соответствующий фрагмент конфигурации sudo(8) может выглядеть как:
+
+mike ALL=NOPASSWD: /usr/share/mkimage-profiles/bin/tar2vm
+
+При работе с git следует иметь в виду, что предоставлять недоверенному
+пользователю право выполнять с повышенными привилегиями доступный ему
+по записи скрипт равнозначно предоставлению полных привилегий root.
+
+Для работы с более специфичными форматами, чем raw ("буквальный"
+образ диска), потребуется утилита qemu-img из одноименного пакета;
+см. тж. вывод команды make help/vm
+
+Также потребуется пакет multipath-tools (/sbin/kpartx).
+
+Пример сборки и запуска VM:
+
+$ make ROOTPW=reallysecret1 vm/bare.img && kvm -hda ~/out/bare.img

features.in/Makefile

@@ -25,8 +25,13 @@ define grepper_body
 	done
 endef
 
+%:
+	$(error BUILDDIR not defined)
+
 else
 
+export BUILDDIR
+
 include $(BUILDDIR)/distcfg.mk
 
 # first rsync what's static, and make backups (*~) --
@@ -62,11 +67,9 @@ $(FEATURES):
 	for sub in / $(SUBPROFILES); do \
 		dirtags=; \
 		if [ "$$sub" = / ]; then \
-			parts=lib; \
 			srcdirs="."; \
 			dst="."; \
 		else \
-			parts=; \
 			src="$${sub%/*}"; \
 			dst="$${sub#*/}"; \
 			srcdirs=; \
@@ -89,7 +92,7 @@ $(FEATURES):
 		for srcdir in $$srcdirs; do \
 			[ -d "$$srcdir" ] || continue; \
 			pushd "$$srcdir" >&/dev/null; \
-			for part in $$parts {image-,}scripts.d; do \
+			for part in lib {image-,}scripts.d; do \
 				destdir="$(BUILDDIR)/$$dst/$$part"; \
 				[ -d "$$destdir" ] || continue; \
 				if [ "$$sub" = / -a -d "$$part" ]; then \

features.in/bootloader/config.mk

@@ -5,6 +5,7 @@
 # - remember .base if adding yet another *_PACKAGES
 
 use/bootloader: use/install2 sub/main
+	@$(call add_feature)
 	@$(call add,BASE_PACKAGES,alterator-$$(BASE_BOOTLOADER))
 
 use/bootloader/grub use/bootloader/lilo: use/bootloader/%: use/bootloader

features.in/branding/README

@@ -0,0 +1,21 @@
+Эта фича врезается в makefile субпрофилей и обеспечивает
+добавление задающих внешний вид и сообщения дистрибутива
+пакетов; см. тж. http://www.altlinux.org/Branding
+
+Назначение и возможные значения (если требуются):
+
+- STAGE1_BRANDING
+  + относится к загрузке со сгенерированного образа (например, ISO)
+  + bootloader bootsplash (при старте)
+
+- STAGE2_BRANDING
+  + общая часть для всех вариантов stage2
+  + bootsplash (при выключении)
+
+- INSTALL2_BRANDING
+  + специфические пакеты брендирования инсталятора
+  + notes slideshow
+
+- THE_BRANDING
+  + общий список для использования в установленной системе и LiveCD
+  + alterator bootsplash graphics indexhtml notes slideshow

features.in/branding/config.mk

@@ -0,0 +1,11 @@
+# NB: release part of branding goes to install2 feature
+use/branding:
+	@$(call add_feature)
+
+# NB: not every distro might have all the branding of its own
+use/branding/full: use/branding use/syslinux/ui/gfxboot
+	@$(call add,THE_BRANDING,alterator bootsplash graphics)
+	@$(call add,THE_BRANDING,indexhtml notes slideshow)
+
+use/branding/complete: use/branding/full use/plymouth/full
+	@$(call add,INSTALL2_BRANDING,notes slideshow)

features.in/branding/install2/lib/50branding.mk

@@ -0,0 +1 @@
+IMAGE_PACKAGES_REGEXP += $(call branding,$(INSTALL2_BRANDING))

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

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

features.in/branding/live/lib/50branding.mk

@@ -0,0 +1 @@
+IMAGE_PACKAGES_REGEXP += $(call branding,$(THE_BRANDING))

features.in/branding/main/lib/50branding.mk

@@ -0,0 +1 @@
+IMAGE_PACKAGES_REGEXP += $(call branding,$(THE_BRANDING))

features.in/branding/stage1/lib/50branding.mk

@@ -0,0 +1 @@
+CHROOT_PACKAGES_REGEXP += $(call branding,$(STAGE1_BRANDING))

features.in/branding/stage2/lib/40branding.mk

@@ -0,0 +1 @@
+IMAGE_PACKAGES_REGEXP += $(call branding,$(STAGE2_BRANDING))

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

@@ -16,33 +16,13 @@ BOOT_ABST := $(META_ABSTRACT)
 
 BOOT_TYPE := isolinux
 
-# Metadata/ needed only for installers (and not for e.g. syslinux.iso)
-# FIXME: installable live needs it too, don't move to install2 feature
-### see also .../pkg.in/lists/Makefile
-ifneq (,$(findstring install2,$(FEATURES)))
-METADATA = metadata
-endif
-
 # see also ../scripts.d/01-isosort; needs mkimage-0.2.2+
 MKI_SORTFILE := /tmp/isosort
 
 all: $(GLOBAL_DEBUG) prep copy-subdirs copy-tree run-scripts pack-image \
 	postprocess $(GLOBAL_CLEAN_WORKDIR)
 
-prep: $(GLOBAL_DEBUG) dot-disk $(METADATA) imagedir
+prep: $(GLOBAL_DEBUG) dot-disk $(WHATEVER) imagedir
-
-metadata: dot-base
-	@mkdir -p files/Metadata
-	@rm -f files/Metadata/pkg-groups.tar
-# see also alterator-pkg (backend3/pkg-install); we only tar up what's up to it
-	@tar -cvf files/Metadata/pkg-groups.tar -C $(PKGDIR) \
-		$$(echo $(call list,$(MAIN_GROUPS) .base) \
-			$(call group,$(MAIN_GROUPS)) \
-		   | sed 's,$(PKGDIR)/*,,g')
-
-dot-base:
-	@p="$(call kpackages,$(THE_KMODULES) $(BASE_KMODULES),$(KFLAVOURS))"; \
-	echo -e "\n## added by build-distro.mk\n$$p" >> $(call list,.base)
 
 dot-disk:
 	@mkdir -p files/.disk

features.in/build-ve/image-scripts.d/03services

@@ -8,6 +8,6 @@
 
 [ -x /sbin/chkconfig ] || exit 0
 
-for i in network random syslogd random; do chkconfig $i on; done
+for i in network random syslogd; do chkconfig $i on; done
 for i in fbsetfont netfs rawdevices; do chkconfig $i off; done
 :

features.in/build-vm/README

@@ -0,0 +1,3 @@
+Эта фича конфигурирует создание образа виртуальной машины (VM).
+Дополняет финальную стадию сборки (lib/, image-scripts.d/).
+Требует для работы sudo(8) -- см. тж. ../../doc/vm.txt .

features.in/build-vm/config.mk

@@ -0,0 +1,4 @@
+# hooked from ../../lib/sugar.mk
+use/build-vm:
+	@$(call add_feature)
+	@$(call xport,ROOTPW)

features.in/build-vm/image-scripts.d/00root

@@ -0,0 +1,11 @@
+#!/bin/sh
+
+if [ -n "$GLOBAL_ROOTPW" ]; then
+	if type -t chpasswd >&/dev/null; then
+		echo "root:$GLOBAL_ROOTPW" | chpasswd
+	else
+		echo "** warning: chpasswd binary missing" >&2
+	fi
+else
+	echo "** warning: no root password provided, you're on your own" >&2
+fi

features.in/build-vm/image-scripts.d/03services

@@ -0,0 +1,9 @@
+#!/bin/sh
+# VMs might have no means to communicate with the outer
+# world except for networking
+
+[ -x /sbin/chkconfig ] || exit 0
+
+for i in network random syslogd; do chkconfig $i on; done
+for i in fbsetfont netfs rawdevices; do chkconfig $i off; done
+:

features.in/build-vm/image-scripts.d/04inittab

@@ -0,0 +1,4 @@
+#!/bin/sh -e
+# we don't need no extra gettys in VMs
+[ -s /etc/inittab ] || exit 0
+sed -i 's,^[3-9]\+:[0-9]\+:respawn:/sbin/mingetty.*,#&,' /etc/inittab

features.in/build-vm/image-scripts.d/06syslog

@@ -0,0 +1,12 @@
+#!/bin/sh -e
+# tweak syslog configuration to avoid hard sync logging (one is better off
+# doing remote syslog if you do care for reliable data anyways)
+# credits: vvk@, thresh@ (2010)
+
+CONFIG=/etc/syslog.conf
+
+[ ! -f "$CONFIG" ] || \
+	sed -i \
+		-e 's,-/var/log/,/var/log/,g' \
+		-e 's,/var/log/,-/var/log/,g' \
+		"$CONFIG"

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

@@ -0,0 +1,13 @@
+#!/bin/sh
+# predictable file locations make bootloader configuration simple;
+# this script relates to .../features.in/stage2/stage1/scripts.d/80-make-initfs
+
+kver="$(rpm -qa 'kernel-image*' \
+            --qf '%{installtime} %{version}-%{name}-%{release}\n' \
+        | sort -n \
+        | tail -n 1 \
+        | cut -f 2 -d ' ' \
+        | sed 's/kernel-image-//')"
+
+ln -s vmlinuz-$kver /boot/vmlinuz
+ln -s initrd-$kver.img /boot/initrd.img

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

@@ -0,0 +1,54 @@
+# step 4: build the virtual machine image
+
+IMAGE_PACKAGES = $(SYSTEM_PACKAGES) \
+		 $(COMMON_PACKAGES) \
+		 $(BASE_PACKAGES) \
+		 $(THE_PACKAGES) \
+		 $(call list,$(BASE_LISTS) $(THE_LISTS)) \
+		 $(call kpackages,$(THE_KMODULES) $(BASE_KMODULES),$(KFLAVOURS))
+
+# intermediate chroot archive
+VM_TARBALL := $(IMAGE_OUTDIR)/$(IMAGE_NAME).tar
+VM_RAWDISK := $(IMAGE_OUTDIR)/$(IMAGE_NAME).raw
+
+ifeq (,$(ROOTPW))
+$(error please provide root password via ROOTPW)
+endif
+
+check-sudo:
+	@if ! type -t sudo >&/dev/null; then \
+		echo "** error: sudo not available, see doc/vm.txt" >&2; \
+		exit 1; \
+	fi
+
+prepare-image: check-sudo
+	@if ! sudo $(TOPDIR)/bin/tar2vm \
+		"$(VM_TARBALL)" "$(VM_RAWDISK)" $$VM_SIZE; then \
+		echo "** error: sudo tar2vm failed, see also doc/vm.txt" >&2; \
+		exit 1; \
+	fi
+
+convert-image: prepare-image
+	@case "$(IMAGE_TYPE)" in \
+	"img") mv "$(VM_RAWDISK)" "$(IMAGE_OUTPATH)"; exit 0;; \
+	"vhd") VM_FORMAT="vpc";; \
+	*) VM_FORMAT="$(IMAGE_TYPE)"; \
+	esac; \
+	if ! type -t qemu-img >&/dev/null; then \
+		echo "** warning: qemu-img not available" >&2; \
+	else \
+		qemu-img convert -O "$$VM_FORMAT" \
+			"$(VM_RAWDISK)" "$(IMAGE_OUTPATH)"; \
+		rm "$(VM_RAWDISK)"; \
+	fi
+
+run-image-scripts: GLOBAL_CLEANUP_PACKAGES := $(CLEANUP_PACKAGES)
+run-image-scripts: GLOBAL_ROOTPW := $(ROOTPW)
+
+# override
+pack-image: MKI_PACK_RESULTS := tar:$(VM_TARBALL)
+
+all: $(GLOBAL_DEBUG) build-image copy-tree run-image-scripts pack-image \
+	convert-image postprocess $(GLOBAL_CLEAN_WORKDIR)
+
+prep: imagedir

features.in/cleanup/config.mk

@@ -1,5 +1,6 @@
 use/cleanup:
 	@$(call add_feature)
+	@$(call xport,CLEANUP_PACKAGES)
 
 use/cleanup/installer: use/cleanup
 	@$(call add,CLEANUP_PACKAGES,'installer-*')

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

@@ -0,0 +1,7 @@
+#!/bin/sh -efu
+# remove temporary packages from the installed system
+
+[ -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/install2/image-scripts.d/90cleanup-pkgs

@@ -14,7 +14,7 @@ cat > "$SCRIPT" << EOF
 # don't override the script start message on the same line
 echo "removing $GLOBAL_CLEANUP_PACKAGES"
 
-# remove extra packages from installed system
+# remove temporary packages from the installed system
 list="\$(exec_chroot rpmquery -a --qf='%{NAME}\\n' $GLOBAL_CLEANUP_PACKAGES)"
 [ -z "\$list" ] || exec_chroot apt-get remove -f -y  -- \$list
 EOF

features.in/firmware/config.mk

@@ -3,17 +3,23 @@
 #     for mkmodpack to use
 
 use/firmware:
+	@$(call add_feature)
 	@$(call add,SYSTEM_PACKAGES,firmware-linux)
 
 use/firmware/server: use/firmware
 	@$(call add,SYSTEM_PACKAGES,firmware-aic94xx-seq)
-	@$(call add,MAIN_PACKAGES_REGEXP,firmware-ql.*)
+	@$(call add,THE_PACKAGES_REGEXP,firmware-ql.*)
 
+# 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
-	@$(call add,MAIN_PACKAGES,firmware-acx100)
+	@$(call add,THE_KMODULES,bcmwl ndiswrapper)
-	@$(call add,MAIN_PACKAGES,firmware-i2400m)
+	@$(call add,THE_PACKAGES,firmware-acx100)
-	@$(call add,MAIN_PACKAGES_REGEXP,firmware-carl9170.*)
+	@#$(call add,THE_PACKAGES,firmware-i2400m)
-	@$(call add,MAIN_PACKAGES_REGEXP,firmware-ipw.*)
+	@$(call add,THE_PACKAGES_REGEXP,firmware-carl9170.*)
-	@#$(call add,MAIN_PACKAGES_REGEXP,firmware-iwl.*)
+	@$(call add,THE_PACKAGES_REGEXP,firmware-prism.*)
-	@$(call add,MAIN_PACKAGES_REGEXP,firmware-rt.*)
+	@$(call add,THE_PACKAGES_REGEXP,firmware-ipw.*)
-	@$(call add,MAIN_PACKAGES_REGEXP,firmware-zd.*)
+	@#$(call add,THE_PACKAGES_REGEXP,firmware-iwl.*)
+	@#$(call add,THE_PACKAGES_REGEXP,firmware-rt.*)
+	@$(call add,THE_PACKAGES_REGEXP,firmware-zd.*)

features.in/install2/config.mk

@@ -1,11 +1,19 @@
-use/install2: use/stage2 sub/stage2/install2 use/cleanup/installer
+# alterator-based installer, second (livecd) stage
+use/install2: use/stage2 sub/stage2/install2 use/metadata use/cleanup/installer
 	@$(call add_feature)
 	@$(call set,INSTALL2_PACKAGES,installer-distro-$$(INSTALLER)-stage2)
 	@$(call add,INSTALL2_PACKAGES,branding-$$(BRANDING)-alterator)
-	@$(call add,INSTALL2_PACKAGES,branding-$$(BRANDING)-notes)
 	@$(call add,BASE_PACKAGES,branding-$$(BRANDING)-release)
 	@$(call add,BASE_LISTS,$(call tags,basesystem))
+	@$(call xport,BASE_BOOTLOADER)
 
-### FR: curl-mini
 use/install2/net: use/install2
 	@$(call add,INSTALL2_PACKAGES,curl)
+
+# modern free xorg drivers for mainstream hardware requires 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)

features.in/install2/install2/image-scripts.d/99cleanupdb

@@ -3,9 +3,6 @@
 echo "** install2 packages before rpmdb purge:"
 rpmquery -a --qf='%{NAME} %{VERSION}-%{RELEASE}\n'
 
-# not going to need them without rpmdb, it's not even rescue anymore
-apt-get remove -f -y apt libapt
-
 # remove rpm, apt databases and cache
 find /var/lib/rpm /var/lib/apt /var/cache/apt -type f -delete
 

features.in/install2/install2/stage2cfg.mk

@@ -8,9 +8,6 @@ MKI_PACK_RESULTS = squash:altinst
 # also removed in a cleanup hook but to spare a few cycles...
 HSH_EXCLUDE_DOCS = 1
 
-# pass downstream
-GLOBAL_BASE_BOOTLOADER := $(BASE_BOOTLOADER)
-
 debug::
 	@echo "** install2: IMAGE_PACKAGES: $(IMAGE_PACKAGES)"
 	@echo "** install2: IMAGE_PACKAGES_REGEXP: $(IMAGE_PACKAGES_REGEXP)"

features.in/kernel/README

@@ -0,0 +1 @@
+Эта фича привносит код, имеющий смысл при добавлении в образ ядра.

features.in/kernel/config.mk

@@ -0,0 +1,4 @@
+###
+use/kernel:
+	@$(call add_feature)
+	@$(call set,KFLAVOURS,std-def)

features.in/kernel/lib/10-kernel.mk

@@ -0,0 +1,6 @@
+# step 4: build the distribution image
+#         take care for kernel bits
+
+DOT_BASE += $(call kpackages, \
+	    $(THE_KMODULES) $(BASE_KMODULES) $(BASE_KMODULES_REGEXP), \
+	    $(KFLAVOURS))

features.in/live/config.mk

@@ -9,18 +9,33 @@ use/live: use/stage2 sub/stage2/live
 use/live/base: use/live use/syslinux/ui/menu
 	@$(call add,LIVE_LISTS,$(call tags,base && (live || network)))
 
+# a very simplistic one
+use/live/x11: use/live use/x11/xorg
+	@$(call add,LIVE_PACKAGES,xinit)
+
 # optimized out: use/x11/xorg
-use/live/desktop: use/live/base use/x11/wacom use/virtualbox/guest \
+use/live/desktop: use/live/base use/x11/wacom use/live/sound +vmguest +power
-	use/live/sound +power
 	@$(call add,LIVE_LISTS,$(call tags,desktop && (live || network)))
+	@$(call add,LIVE_LISTS,$(call tags,base l10n))
 	@$(call add,LIVE_PACKAGES,fonts-ttf-dejavu fonts-ttf-droid)
 	@$(call add,SYSLINUX_CFG,localboot)
 
+# alterator-based permanent installation
+use/live/install: use/metadata use/syslinux/localboot.cfg
+	@$(call add,LIVE_PACKAGES,livecd-install)
+
+# text-based installation script
+use/live/textinstall: use/syslinux/localboot.cfg
+	@$(call add,LIVE_PACKAGES,live-install)
+
 # NB: there's an unconditional live/image-scripts.d/40-autologin script
 #     *but* it only configures some of the *existing* means; let's add one
-#     for the cases when there should be no display manager
+#     or another for the cases when there should be no display manager
-use/live/autologin: use/live use/x11/xorg
+use/live/autologin: use/live/x11
-	@$(call add,LIVE_PACKAGES,autologin xinit)
+	@$(call add,LIVE_PACKAGES,autologin)
+
+use/live/nodm: use/live/x11
+	@$(call add,LIVE_PACKAGES,nodm)
 
 use/live/hooks: use/live
 	@$(call add,LIVE_PACKAGES,livecd-run-hooks)

features.in/live/live/image-scripts.d/03services

@@ -0,0 +1,42 @@
+#!/bin/sh
+# see also m-p-d::profiles/live/image-scripts.d/init3-services
+
+[ -x /sbin/chkconfig ] || exit 0
+
+ENABLE="
+alteratord
+livecd-evms
+livecd-fstab
+livecd-hostname
+livecd-save-nfs
+livecd-setauth
+livecd-setlocale
+network
+NetworkManager
+random
+rpcbind
+"
+
+# NB: dnsmasq: https://bugzilla.altlinux.org/show_bug.cgi?id=18799
+# NB: sshd might be needed for some particular cases
+DISABLE="
+anacron
+bridge
+clamd
+crond
+dhcpd
+dnsmasq
+mdadm
+netfs
+openvpn
+rawdevices
+slapd
+smartd
+sshd
+update_wms
+xinetd
+"
+
+for i in $ENABLE;  do chkconfig $i on  2>/dev/null; done
+for i in $DISABLE; do chkconfig $i off 2>/dev/null; done
+:

features.in/live/live/image-scripts.d/30-users

@@ -2,8 +2,7 @@
 # * reset password for root
 # * add user `altlinux' (without password)
 
-NPG="nopasswdlogin"
+GRPLIST="users scanner audio radio proc cdrom cdwriter wheel fuse"
-GRPLIST="users scanner audio radio proc cdrom cdwriter wheel fuse $NPG"
 
 verbose()
 {
@@ -15,7 +14,6 @@ verbose()
 add_user()
 {
     verbose "Add $1 user"
-    groupadd -r "$NPG"
     local groups=
     for g in $GRPLIST; do
 	if groupmod $g 2>/dev/null; then
@@ -28,6 +26,8 @@ add_user()
     done
 
     useradd -p "" -G "$groups" "$1" ||:
+    # Workaround for ALT#13213
+    chown -R "$1:auth" "/etc/tcb/$1"
     chown -R "$1:$1" /home/$1
 
     if [ -n "$GLOBAL_CRYPT_HOMES" ]; then

features.in/live/live/image-scripts.d/35-xdg-user-dirs

@@ -0,0 +1,6 @@
+#!/bin/sh
+# Turn on xdg-user-dirs.
+# NB: not yet available on t6/p6 hence the warning
+
+control xdg-user-dirs enabled ||
+	echo "** warning: control xdg-user-dirs failed" >&2

features.in/live/live/image-scripts.d/40-autologin

@@ -1,20 +1,28 @@
-#!/bin/sh -ef
+#!/bin/sh -e
 
 if [ ! -x /usr/bin/X ]; then
-	echo "warning: autologin feature requested but X not installed" >&2
+	echo "SKIP autologin: X not installed" >&2
 	exit 0
 fi
 
 USER=altlinux
 
-# setup runlevel
+add_nopasswdlogin_group()
+{
+	[ -f "/etc/pam.d/$1" ] &&
+	egrep -qs '^auth.+user[[:blank:]]+ingroup[[:blank:]]+nopasswdlogin' "/etc/pam.d/$1" &&
+	groupadd -r nopasswdlogin &&
+	gpasswd -a "$USER" nopasswdlogin
+}
+
+## setup runlevel
 INITTAB=/etc/inittab
 if [ -f "$INITTAB" ]; then
 	[ -z "$runlevel" ] && runlevel=5
 	sed -i "s,^\(id:\)\(.*\)\(:initdefault.*\),\\1$runlevel\\3," "$INITTAB"
 fi
 
-# autologin^2
+## autologin^2
 if [ -x /usr/sbin/autologin ]; then
 	cat << E_O_F >> /etc/sysconfig/autologin
 USER=$USER
@@ -22,23 +30,25 @@ AUTOLOGIN=yes
 E_O_F
 fi
 
-# lightdm autologin
+## lightdm autologin
 LIGHTDM_CONF=/etc/lightdm/lightdm.conf
 if [ -f "$LIGHTDM_CONF" ]; then
 	sed -i \
 		-e "s/^#\(autologin-user=\).*$/\1$USER/" \
 		-e "s/^#\(autologin-user-timeout=0\)/\1/" \
 		"$LIGHTDM_CONF"
+	add_nopasswdlogin_group lightdm ||:
 fi
 
-# gdm2 autologin
+## gdm2 autologin
 GDM_CONF=/etc/X11/gdm/custom.conf
 if [ -f "$GDM_CONF" ]; then
 	sed -i -e '/\[daemon\]/aAutomaticLoginEnable=true\nAutomaticLogin='$USER \
 		"$GDM_CONF"
+	add_nopasswdlogin_group gdm ||:
 fi
 
-# kdm3 autologin
+## kdm3 autologin
 # TODO: iterate over kdm{,4} if feasible
 KDMRC=/etc/X11/kdm/kdmrc
 if [ -f "$KDMRC" ]; then
@@ -47,3 +57,66 @@ if [ -f "$KDMRC" ]; then
 		-e '/AutoLoginUser/ s,^.*$,AutoLoginUser='$USER',' \
 		"$KDMRC"
 fi
+
+## nodm autologin (the last since the most intrusive)
+# FIXME nodm and xinitrc should be modified (also in p6)
+NODM_RC=/etc/sysconfig/nodm
+NODM_EXE=/usr/sbin/nodm
+
+if [ -x "$NODM_EXE" ]; then
+	cat << E_O_F >> "$NODM_RC"
+export NODM_USER=$USER
+E_O_F
+else
+	exit 0
+fi
+
+# FIXME: drop when #27449 is fixed
+PREFDM=/etc/X11/prefdm
+if [ -f "$PREFDM" ] && ! grep -q nodm "$PREFDM"; then
+	sed -i \
+		-e '/AUTOLOGIN_EXE=/ s,^.*$,AUTOLOGIN_EXE='$NODM_EXE',' \
+		-e '/AUTOLOGIN_CFG=/ s,^.*$,AUTOLOGIN_CFG='$NODM_RC',' \
+		"$PREFDM"
+fi
+
+# FIXME: drop when #27451 is fixed
+NODM_PAM=/etc/pam.d/nodm
+for module in pam_console.so pam_ck_connector.so; do
+	if [ -f /lib*/security/$module ]; then
+		str="-session	optional	$module"
+		grep -q "^$str$" "$NODM_PAM" || echo -e "$str" >> "$NODM_PAM"
+	fi
+done
+
+NODM_POLKIT_CONFDIR=/etc/polkit-1/localauthority/50-local.d
+NODM_POLKIT_CONF=org.freedesktop.NetworkManager.pkla
+if [ -d "$NODM_POLKIT_CONFDIR" ]; then
+	cat > "$NODM_POLKIT_CONFDIR/$NODM_POLKIT_CONF" << _EOF_
+[nm-applet]
+Identity=unix-group:users
+Action=org.freedesktop.NetworkManager.*
+ResultAny=yes
+ResultInactive=no
+ResultActive=yes
+_EOF_
+fi
+
+NODM_DBUS_NM_CONF=/etc/dbus-1/system.d/nm-applet.conf
+if [ -f "$NODM_DBUS_NM_CONF" ]; then
+	sed -i "s/at_console=\"true\"/user=\"$USER\"/" "$NODM_DBUS_NM_CONF"
+fi
+
+NODM_G2KR_DIR=/etc/skel/.gnome2/keyrings
+mkdir -p "$NODM_G2KR_DIR"
+echo -n login > "$NODM_G2KR_DIR"/default
+cat > "$NODM_G2KR_DIR"/login.keyring << _EOF_
+[keyring]
+display-name=login
+ctime=0
+mtime=0
+lock-on-idle=false
+lock-after=false
+_EOF_
+
+:

features.in/live/live/image-scripts.d/50-etcnet-dhcp

@@ -1,14 +0,0 @@
-#!/bin/sh -efu
-# attempt to autoconfigure ethernet
-
-[ -x /sbin/dhcpcd -o -x /sbin/dhclient ] || {
-	echo "NOT configuring DHCP for eth0" >&2
-	exit 0
-}
-
-echo "configuring DHCP for eth0" >&2
-
-mkdir -p /etc/net/ifaces/eth0 && {
-	echo TYPE=eth
-	echo BOOTPROTO=dhcp
-} > /etc/net/ifaces/eth0/options ||:

features.in/live/live/image-scripts.d/50-setup-network

@@ -0,0 +1,53 @@
+#!/bin/sh
+# Setup network settings
+# 1. Init /etc/hosts with "127.0.0.1 localhost"
+# 2. Set hostname, domainname
+# 3. Set defaults for NetworkManager or
+#    attempt to autoconfigure eth0 by etcnet.
+
+. shell-config
+
+verbose()
+{
+	if [ -n "$GLOBAL_VERBOSE" ]; then
+		echo "HOOK: 50-setup-network: $@"
+	fi
+}
+
+verbose "has started"
+
+# At startup time hostname may be changed by live-hostname package.
+HOSTNAME="localhost.localdomain"
+DOMAINNAME="localdomain"
+
+verbose "Init /etc/hosts with 127.0.0.1 localhost"
+echo "127.0.0.1 localhost localhost.localdomain" > /etc/hosts
+
+netcfg="/etc/sysconfig/network"
+
+verbose "Enable networking, set hostname to $HOSTNAME, domainname to $DOMAINNAME"
+shell_config_set "$netcfg" NETWORKING yes
+shell_config_set "$netcfg" HOSTNAME "$HOSTNAME"
+shell_config_set "$netcfg" DOMAINNAME "$DOMAINNAME"
+
+
+if  [ -x /usr/sbin/NetworkManager ] ; then
+	verbose "Setup defaults for NetworkManager"
+	shell_config_set /etc/net/ifaces/default/options-eth NM_CONTROLLED yes
+	shell_config_set /etc/net/ifaces/default/options-eth DISABLED yes
+	shell_config_set /etc/net/ifaces/default/options-eth BOOTPROTO dhcp
+else
+	# attempt to autoconfigure ethernet by etcnet
+	if [ -x /sbin/dhcpcd -o -x /sbin/dhclient ]; then
+		verbose "configuring DHCP for eth0"
+
+		mkdir -p /etc/net/ifaces/eth0 && {
+		echo TYPE=eth
+		echo BOOTPROTO=dhcp
+		} > /etc/net/ifaces/eth0/options
+	else
+		verbose "NOT configuring eth0 for DHCP"
+	fi
+fi
+
+verbose "finished"

features.in/live/live/stage2cfg.mk

@@ -2,6 +2,9 @@
 
 STAGE2_KMODULES = $(THE_KMODULES) $(LIVE_KMODULES)
 
+IMAGE_PACKAGES_REGEXP = $(THE_PACKAGES_REGEXP) \
+			$(LIVE_PACKAGES_REGEXP)
+
 IMAGE_PACKAGES = $(COMMON_PACKAGES) $(THE_PACKAGES) $(LIVE_PACKAGES) \
 		 $(call map,list, \
 			$(THE_LISTS) $(THE_GROUPS) \
@@ -9,3 +12,7 @@ IMAGE_PACKAGES = $(COMMON_PACKAGES) $(THE_PACKAGES) $(LIVE_PACKAGES) \
 		 interactivesystem
 
 MKI_PACK_RESULTS = squash:live
+
+debug::
+	@echo "** live: IMAGE_PACKAGES: $(IMAGE_PACKAGES)"
+	@echo "** live: IMAGE_PACKAGES_REGEXP: $(IMAGE_PACKAGES_REGEXP)"

features.in/ltsp/config.mk

@@ -1,6 +1,7 @@
 +ltsp: use/ltsp/base; @:
 
 use/ltsp:
+	@$(call add_feature)
 	@$(call add,INSTALL2_PACKAGES,installer-feature-ltsp-stage2)
 	@$(call add,MAIN_LISTS,ltsp-client ltsp-client.$(ARCH))
 	@$(call add,BASE_LISTS,ltsp)

features.in/metadata/README

@@ -0,0 +1,3 @@
+Эта фича занимается метаданными в составе образов --
+в первую очередь инсталяционных и пригодных к установке
+"живых".

features.in/metadata/config.mk

@@ -0,0 +1,2 @@
+use/metadata:
+	@$(call add_feature)

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

@@ -0,0 +1,40 @@
+# step 4: build the distribution image
+
+# package lists are needed for installer and live-install images
+METADIR := files/Metadata
+
+# preparation targets of ../../build-distro/lib/build-distro.mk
+WHATEVER += metadata
+
+# handle these too
+DOT_BASE += $(BASE_PACKAGES_REGEXP)
+
+# args: name, suffix, command
+define dump-THEM
+if [ -n "$($(1)_$(2))" ]; then echo -e "\n## $(1)_$(2)"; $(3) $($(1)_$(2)); fi;
+endef
+
+dump-PACKAGES = $(call dump-THEM,$(1),PACKAGES,echo)
+dump-LISTS = $(call dump-THEM,$(1),LISTS,cat)
+
+# BASE_PACKAGES, BASE_LISTS and whatever else goes into base install;
+# thus construct requisite .base packagelist for alterator-pkg
+metadata-.base:
+	@cd $(call list,/); \
+	{ \
+		echo "## generated by features.in/metadata/lib/metadata.mk"; \
+		$(foreach p,SYSTEM COMMON THE BASE,$(call dump-PACKAGES,$(p))) \
+		$(foreach l,THE BASE,$(call dump-LISTS,$(l))) \
+		if [ -n "$(DOT_BASE)" ]; then \
+			echo -e "\n## DOT_BASE\n$(DOT_BASE)"; \
+		fi; \
+	} | sed -re '/^[^[:space:]#]/ s/[[:space:]]+/\n/g' > .base
+
+# see also alterator-pkg (backend3/pkg-install);
+# we only tar up what's up to it
+metadata: metadata-.base
+	@mkdir -p $(METADIR); \
+	tar -C $(PKGDIR) -cvf - \
+		$(call rlist,$(MAIN_GROUPS) .base) \
+		$(call rgroup,$(MAIN_GROUPS)) \
+	> $(METADIR)/pkg-groups.tar

features.in/pack/config.mk

@@ -1,3 +1,6 @@
+### this might really belong to build-*...
+
+# distributions
 DISTRO_EXTS := .iso
 
 use/pack:
@@ -12,6 +15,7 @@ else
 	@$(call set,IMAGE_PACKTYPE,isodata)
 endif
 
+# virtual environments
 VE_ARCHIVES := tar cpio
 VE_COMPRESSORS := gz xz# there's no sense in bzip2 by now
 VE_ZIPS := $(call addsuffices, \
@@ -34,3 +38,8 @@ $(foreach c,$(VE_ARCHIVES), \
 	$(eval $(call PACK_containers,$(c))) \
 	$(foreach z,$(VE_COMPRESSORS), \
 		$(eval $(call PACK_compressors,$(c),$(z)))))
+
+# virtual machines
+VM_EXTS := .img .qcow2 .vdi .vmdk .vhd
+
+$(VM_EXTS:.%=use/pack/%): use/pack; @:

features.in/plymouth/README

@@ -0,0 +1,5 @@
+Эта фича предназначена для добавления поддержки plymouth
+-- современной реализации bootsplash.  Плотно взаимодействует
+с фичей branding по объективным причинам, но оформлена отдельно
+для возможности собирать образы с частичным брендированием либо
+"без излишеств".

features.in/plymouth/config.mk

@@ -0,0 +1,28 @@
++plymouth: use/plymouth/full; @:
+
+# and a few silent aliases
+use/plymouth/live: use/plymouth/stage2
+use/plymouth/install2: use/plymouth/stage2
+
+use/plymouth:
+	@$(call add_feature)
+
+# NB: *_REGEXP due to branding() using regexp and the
+#     dependency resolution having to occur within a
+#     single transaction (due to plymouth-system-theme)
+
+# looks like there's no sense to pull in progressbars
+# while leaving the very basic text bootloader screen
+use/plymouth/stage2: use/plymouth use/branding \
+	use/syslinux/ui/gfxboot use/stage2/kms
+	@$(call add,STAGE1_PACKAGES_REGEXP,make-initrd-plymouth)
+	@$(call add,STAGE1_BRANDING,bootsplash)
+	@$(call add,STAGE2_BRANDING,bootsplash)
+	@$(call add,STAGE2_BOOTARGS,quiet splash)
+
+use/plymouth/base: use/plymouth/stage2 use/install2/kms
+	@$(call add,INSTALL2_PACKAGES,installer-feature-setup-plymouth)
+	@$(call add,BASE_PACKAGES_REGEXP,make-initrd-plymouth cpio)
+	@$(call add,THE_BRANDING,bootsplash)
+
+use/plymouth/full: use/plymouth/stage2 use/plymouth/base; @:

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

@@ -0,0 +1,7 @@
+#!/bin/sh
+CONFIG=/etc/plymouth/plymouthd.conf
+
+if [ -f "$CONFIG" ]; then
+	grep -q '^Theme=' "$CONFIG" || sed -i 's/#\([T\[]\)/\1/' "$CONFIG"
+	echo 'FEATURES += plymouth' >> /etc/initrd.mk
+fi

features.in/plymouth/stage2/image-scripts.d/10-plymouth

@@ -0,0 +1,3 @@
+#!/bin/sh
+
+cp -a /usr/share/plymouth/default-install-duration /var/lib/plymouth/boot-duration

features.in/power/config.mk

@@ -3,6 +3,7 @@
 # common
 # TODO: invent multi-target scripts and integrate that 08-powerbutton
 use/power:
+	@$(call add_feature)
 	@$(call add,COMMON_PACKAGES,installer-feature-powerbutton-stage3)
 
 # modern power management
@@ -20,4 +21,4 @@ use/power/acpi/powersave: use/power/acpi
 
 # legacy power management
 use/power/apm: use/power
-	@$(call add,COMMON_PACKAGES,apmd)
+	@$(call add,COMMON_PACKAGES,apmd lphdisk)

features.in/slinux/README

@@ -0,0 +1 @@
+Наборы пакетов для семейства дистрибутивов Simply Linux.

features.in/slinux/config.mk

@@ -0,0 +1,20 @@
+use/slinux: use/x11/xfce use/x11/gdm2.20
+	@$(call add_feature)
+	@$(call set,BRANDING,simply-linux)
+	@$(call add,THE_BRANDING,menu xfce-settings)
+	@$(call add,THE_LISTS,gnome-p2p)
+	@$(call add,THE_LISTS,slinux/$(ARCH))
+	@$(call add,THE_LISTS,slinux/games)
+	@$(call add,THE_LISTS,slinux/graphics)
+	@$(call add,THE_LISTS,slinux/live)
+	@$(call add,THE_LISTS,slinux/misc)
+	@$(call add,THE_LISTS,slinux/misc-dvd)
+	@$(call add,THE_LISTS,slinux/multimedia)
+	@$(call add,THE_LISTS,slinux/network)
+	@$(call add,THE_LISTS,slinux/xfce)
+	@$(call add,THE_LISTS,$(call tags,base l10n))
+
+use/slinux/full: use/isohybrid use/slinux use/systemd \
+	use/firmware/wireless use/branding/complete \
+	use/x11/drm use/x11/3d-proprietary
+	@$(call add,THE_PACKAGES,apt-conf-sisyphus)

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

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

features.in/slinux/live/image-scripts.d/50services

@@ -0,0 +1,29 @@
+#!/bin/sh
+# see also m-p-d::profiles/live/image-scripts.d/init3-services
+
+#[ -x /bin/systemctl ] || exit 0
+#[ -x /bin/systemctl ] || exit 0
+
+ENABLE="
+network
+NetworkManager
+lvm2-monitor
+mdadm
+"
+
+# NB: dnsmasq: https://bugzilla.altlinux.org/show_bug.cgi?id=18799
+# NB: sshd might be needed for some particular cases
+DISABLE="
+sshd
+"
+
+for i in $ENABLE;  do
+	[ -x /bin/systemctl ] && /bin/systemctl enable ${i}.service
+	[ -x /sbin/chkconfig ] && /sbin/chkconfig $i on
+done
+
+for i in $DISABLE; do
+	[ -x /bin/systemctl ] && /bin/systemctl disable ${i}.service
+	[ -x /sbin/chkconfig ] && /sbin/chkconfig $i off
+done
+:

features.in/stage2/config.mk

@@ -3,6 +3,9 @@ use/stage2: sub/stage1
 	@$(call add_feature)
 	@$(call add,STAGE1_PACKAGES,file make-initrd make-initrd-propagator)
 
+use/stage2/kms:
+	@$(call add,STAGE1_KMODULES_REGEXP,drm.*)
+
 # NB: sub/stage2 isn't used standalone but rather
 #     as a base for various livecd modifications
 #     (currently install2, live, rescue)

features.in/stage2/stage1/scripts.d/03-test-kernel

@@ -1,32 +1,55 @@
 #!/bin/sh
+# NB: -f prohibited in this shebang
 # check relevant kernel features availability
 
-GZ_OPTS="-comp gzip"
+CONFIGS=/boot/config-*
-XZ_OPTS="-comp xz -b 524288 -noI"
+GZ_OPTS="-comp gzip -noI"
+XZ_OPTS="-comp xz"
+LZO_OPTS="-comp lzo -noI"
+
+verbose() { [ -n "$GLOBAL_VERBOSE" ] && echo "** $@" >&2; }
+fatal() { echo "** error: $@" >&2; exit 1; }
+
+configured()
+{
+	local option="CONFIG_$1"
+	if grep -q "^$option" $CONFIGS; then
+		verbose "${option%=*} available"
+		return 0
+	else
+		return 1
+	fi
+}
+
+ls $CONFIGS >&/dev/null || fatal "no stage1 kernel config found in /boot"
 
 # test for installer-required filesystems support
-for opt in CONFIG_SQUASHFS CONFIG_AUFS_FS; do
+for opt in SQUASHFS AUFS_FS; do
-	if grep -q "^$opt=[my]$" /boot/config-*; then
+	configured "$opt=[my]" || fatal "stage1 kernel must have $opt support"
-		[ -n "$GLOBAL_VERBOSE" ] && echo "** $opt available"
-	else
-		if [ "$?" = 1 ]; then	# a file exists but lacks the pattern
-			echo "** error: stage1 kernel must have $opt support" >&2
-			exit 1
-		fi
-	fi
 done
 
-# squashfs options: not really neccessary but better than none
+verbose "GLOBAL_SQUASHFS: $GLOBAL_SQUASHFS"
-# NB: this config file should be carried over into install2
+
-if grep -q '^CONFIG_SQUASHFS_XZ=y$' /boot/config-*; then
+options()
-	# TODO: figure out if it's generally worth it even on x86:
+{
-	#       if binaries account for less than ~70% of blocks,
+	# squashfs options: not really neccessary but better than none
-	#       the decompression filter overhead might hurt
+	# NB: this config file should be carried over into install2
-	# NB: there are arm, powerpc and some other filters too
+	if [ "$GLOBAL_SQUASHFS" != "fast" ] && configured "SQUASHFS_XZ=y"; then
-	if grep -q "^CONFIG_X86" /boot/config-*; then
+		# NB: the decompression filter overhead might hurt
-		XZ_OPTS="$XZ_OPTS -Xbcj x86"
+		# NB: there are arm, powerpc and some other filters too
+		if [ "$GLOBAL_SQUASHFS" = "tight" ] && configured "X86"; then
+			XZ_OPTS="$XZ_OPTS -b 524288 -Xbcj x86"
+		else
+			XZ_OPTS="$XZ_OPTS -b 262144 -noI"
+		fi
+		echo "$XZ_OPTS"
+	else	# go fast, or even faster if possible
+		if configured "SQUASHFS_LZO=y"; then
+			echo "$LZO_OPTS"
+		else	# safe default
+			echo "$GZ_OPTS"
+		fi
 	fi
-	echo "PACK_SQUASHFS_OPTS=$XZ_OPTS" > /.image/squashcfg.mk
+}
-else
+
-	echo "PACK_SQUASHFS_OPTS=$GZ_OPTS" > /.image/squashcfg.mk
+echo "PACK_SQUASHFS_OPTS=-no-recovery `options`" > /.image/squashcfg.mk
-fi

features.in/stage2/stage1/scripts.d/11-initrd-misc

@@ -2,10 +2,3 @@
 
 # FIXME: move somewhere else
 #echo 'FEATURES += nfs' >> /etc/initrd.mk
-
-# FIXME: move to plymouth feature
-#if [ -f /etc/plymouth/plymouthd.conf ];then 
-#    sed -i 's/#\([T\[]\)/\1/' /etc/plymouth/plymouthd.conf
-#    echo 'FEATURES += plymouth' >> /etc/initrd.mk
-#fi
-

features.in/stage2/stage1/scripts.d/80-make-initfs

@@ -1,15 +1,26 @@
 #!/bin/sh -efu
 # NB: /etc/initrd.mk carefully prepared by earlier scripts
 
-kver="$(rpm -qa 'kernel-image*' --qf '%{installtime} %{version}-%{name}-%{release}\n' \
+kver="$(rpm -qa 'kernel-image*' \
+	    --qf '%{installtime} %{version}-%{name}-%{release}\n' \
 	| sort -n \
 	| tail -n 1 \
 	| cut -f 2 -d ' ' \
 	| sed 's/kernel-image-//')"
 
-make-initrd --no-checks -k $kver \
+MAKE_INITRD_OPTS="--no-checks -k $kver"
-&& gzip < /boot/initrd-$kver.img > $(getconf LIBDIR)/propagator/initfs \
+MAKE_INITRD_VER="`make-initrd -V \
-|| exit 1
+	| sed -rn 's/^make-initrd version ([0-9.]+)/\1/p'`"
+
+if [ "`rpmvercmp "$MAKE_INITRD_VER" "0.7.8"`" != "-1" ]; then
+	MAKE_INITRD_OPTS="$MAKE_INITRD_OPTS --no-depmod"
+fi
+
+if make-initrd $MAKE_INITRD_OPTS; then
+	gzip < /boot/initrd-$kver.img > $(getconf LIBDIR)/propagator/initfs
+else
+	exit 1
+fi
 
 [ -h /boot/vmlinuz ] || ln -s vmlinuz-$kver /boot/vmlinuz
 [ -h /boot/initrd.img ] || ln -s initrd-$kver.img /boot/initrd.img

features.in/syslinux/cfg.in/05live.cfg

@@ -1,5 +1,5 @@
 label live
   menu label ^LiveCD (no hard disk needed)
   kernel alt0/vmlinuz
-  append initrd=alt0/full.cz fastboot live lowmem showopts automatic=method:cdrom ramdisk_size=@live_size@ stagename=live
+  append initrd=alt0/full.cz fastboot live lowmem showopts automatic=method:cdrom ramdisk_size=@live_size@ stagename=live vga=0x314 @bootargs@
 

features.in/syslinux/cfg.in/20install2.cfg

@@ -1,10 +1,10 @@
 label linux
   menu label ^Install ALT Linux
   kernel alt0/vmlinuz
-  append initrd=alt0/full.cz changedisk fastboot showopts automatic=method:cdrom quiet=1 ramdisk_size=@altinst_size@ vga=0x314
+  append initrd=alt0/full.cz changedisk fastboot showopts automatic=method:cdrom ramdisk_size=@altinst_size@ vga=0x314 @bootargs@
 
 label noapic
   menu label ^Failsafe install
   kernel alt0/vmlinuz
-  append initrd=alt0/full.cz changedisk lowmem noapic nolapic showopts ramdisk_size=@altinst_size@
+  append initrd=alt0/full.cz changedisk lowmem noapic nolapic showopts ramdisk_size=@altinst_size@ xdriver=vesa @bootargs@
 

features.in/syslinux/config.mk

@@ -9,7 +9,7 @@ use/syslinux/ui/%: use/syslinux
 	@$(call set,SYSLINUX_UI,$*)
 	@if [ "$*" == gfxboot ]; then \
 		$(call add,STAGE1_PACKAGES,gfxboot); \
-		$(call add,STAGE1_PACKAGES,branding-$$(BRANDING)-bootloader); \
+		$(call add,STAGE1_BRANDING,bootloader); \
 	fi
 
 # modules and config snippets just add up

features.in/syslinux/generate.mk

@@ -55,7 +55,7 @@ all: debug timeout
 	@echo $(SYSLINUX_FILES) > $(DSTDIR)/syslinux.list
 
 # integerity check
-timeout: copy
+timeout: bootargs
 	@if [ "$(SYSLINUX_TIMEOUT)" -ge 0 ] 2>/dev/null; then \
 		TIMEOUT="$(SYSLINUX_TIMEOUT)"; \
 	else \
@@ -63,6 +63,18 @@ timeout: copy
 	fi; \
 	sed -i "s,@timeout@,$$TIMEOUT," $(DSTDIR)/*.cfg
 
+# pass over additional parameters, if any
+bootargs: clean
+	@if [ -n "$(STAGE2_BOOTARGS)" ]; then \
+		sed -i "s,@bootargs@,$(STAGE2_BOOTARGS)," $(DSTDIR)/*.cfg; \
+	fi; \
+	sed -i "s,@bootargs@,," $(DSTDIR)/*.cfg
+
+clean: copy
+	@if [ "$(SYSLINUX_UI)" = gfxboot ]; then \
+		sed -i "s,\^,," $(DSTDIR)/*.cfg; \
+	fi
+
 copy: prep
 	@cp -pLt $(DSTDIR) -- $(sort \
 		$(foreach C,$(SYSLINUX_CFG),$(call cfg,$(C))) \

features.in/systemd/live/image-scripts.d/20-systemd-locale

@@ -0,0 +1,4 @@
+#!/bin/sh
+# Don't allow systemd to set LANG.
+
+echo 'LANG=' >/etc/locale.conf

features.in/virtualbox/config.mk

@@ -1,4 +0,0 @@
-use/virtualbox/guest:
-	@$(call add_feature)
-	@$(call add,THE_KMODULES,virtualbox-addition)
-	@$(call add,THE_PACKAGES,virtualbox-guest-additions)

features.in/vm-net/README

@@ -0,0 +1,3 @@
+Эта фича добавляет базовую поддержку сети в создаваемый образ
+виртуальной машины.  Принимаются предложения по усовершенствованию
+статической конфигурации.

features.in/vm-net/config.mk

@@ -0,0 +1,11 @@
+use/vm-net:
+	@$(call add_feature)
+	@$(call add,THE_PACKAGES,etcnet)
+
+use/vm-net/dhcp: use/vm-net
+	@$(call add,THE_PACKAGES,dhcpcd)
+	@$(call set,VM_NET,dhcp)
+
+# need to further add VM_NET_IPV4ADDR and VM_NET_IPV4GW
+use/vm-net/static: use/vm-net
+	@$(call set,VM_NET,static)

features.in/vm-net/generate.mk

@@ -0,0 +1,26 @@
+ifdef BUILDDIR
+
+include $(BUILDDIR)/distcfg.mk
+
+all: dir = $(BUILDDIR)/files/etc/net/ifaces/eth0
+all:
+	@write_static() { \
+		echo "$(VM_NET_IPV4ADDR)" > "$(dir)/ipv4address"; \
+		echo "default via $(VM_NET_IPV4GW)" > "$(dir)/ipv4route"; \
+	}; \
+	if [ -n "$(VM_NET)" ] && mkdir -p "$(dir)"; then \
+		case "$(VM_NET)" in \
+		dhcp) ;; \
+		static) write_static;; \
+		*) \
+			echo "** error: unknown value of $(VM_NET)" >&2; \
+			exit 1;; \
+		esac; \
+		{ \
+			echo "TYPE=eth"; \
+			echo "DISABLED=no"; \
+			echo "BOOTPROTO=$(VM_NET)"; \
+		} > "$(dir)/options"; \
+	fi
+
+endif

features.in/vm-ssh/README

@@ -0,0 +1,6 @@
+Эта фича предназначена для добавления в образ виртуальной машины
+поддержки SSH: добавляется клиент и конфигурируется сервер
+(требуется задание пути к существующему публичному ключу
+посредством переменной SSH_KEY).
+
+Фактически требует один из вариантов use/vm-net для осмысленности.

features.in/vm-ssh/config.mk

@@ -0,0 +1,3 @@
+use/vm-ssh:
+	@$(call add_feature)
+	@$(call add,THE_LISTS,openssh)

features.in/vm-ssh/generate.mk

@@ -0,0 +1,12 @@
+ifdef BUILDDIR
+
+include $(BUILDDIR)/distcfg.mk
+
+# prepare the provided public SSH key to be carried over into the VM image
+all: SSH_DIR = $(BUILDDIR)/files/root/.ssh
+all:
+	@if [ -s "$(SSH_KEY)" ]; then \
+		install -pD "$(SSH_KEY)" "$(SSH_DIR)/authorized_keys"; \
+	fi
+
+endif

features.in/vm-ssh/image-scripts.d/50-.ssh-perms

@@ -0,0 +1,5 @@
+#!/bin/sh
+# tighten up permissions just in case
+
+[ ! -d /root/.ssh ] || chmod 700 /root/.ssh
+[ ! -f /root/.ssh/authorized_keys ] || chmod 600 /root/.ssh/authorized_keys

features.in/vmguest/README

@@ -0,0 +1,2 @@
+Эта фича предназначена для конфигурирования поддержки выполнения
+дистрибутивов в качестве гостей в среде виртуальных машин.

features.in/vmguest/config.mk

@@ -0,0 +1,13 @@
++vmguest: use/vmguest/virtualbox use/vmguest/kvm; @:
+
+use/vmguest/virtualbox:
+	@$(call add_feature)
+	@$(call add,THE_KMODULES,virtualbox-addition drm)
+	@$(call add,THE_PACKAGES,virtualbox-guest-additions)
+
+# NB: only reasonable for X11-bearing images
+use/vmguest/kvm:
+	@$(call add_feature)
+	@$(call add,THE_PACKAGES,spice-vdagent)
+
+# see also use/install2/kvm

features.in/x11/config.mk

@@ -1,8 +1,9 @@
 +icewm: use/x11/icewm; @:
-+razorqt: use/x11/razorqt use/x11/lightdm; @:
++razorqt: use/x11/razorqt use/x11/lightdm/qt; @:
 +tde: use/x11/tde use/x11/kdm; @:
 
 use/x11/xorg:
+	@$(call add_feature)
 	@$(call add,THE_LISTS,xorg)
 
 use/x11/wacom: use/x11/xorg
@@ -26,15 +27,18 @@ use/x11/runlevel5: use/x11/xorg
 
 ### xdm: see also #23108
 use/x11/xdm: use/x11/runlevel5
-	@$(call add,THE_PACKAGES,xdm installer-feature-no-xconsole)
+	@$(call add,THE_PACKAGES,xdm installer-feature-no-xconsole-stage3)
 
 ### : some set()-like thing might be better?
-use/x11/lightdm: use/x11/runlevel5
+use/x11/lightdm/qt use/x11/lightdm/gtk: use/x11/lightdm/%: use/x11/runlevel5
-	@$(call add,THE_PACKAGES,lightdm)
+	@$(call add,THE_PACKAGES,lightdm-$*-greeter)
 
 use/x11/kdm: use/x11/runlevel5
 	@$(call add,THE_PACKAGES,kdebase-kdm)
 
+use/x11/gdm2.20: use/x11/runlevel5
+	@$(call add,THE_PACKAGES,gdm2.20)
+
 use/x11/icewm: use/x11/xorg
 	@$(call add,THE_LISTS,$(call tags,icewm desktop))
 
@@ -43,3 +47,9 @@ use/x11/razorqt: use/x11/xorg
 
 use/x11/tde: use/x11/xorg
 	@$(call add,THE_LISTS,$(call tags,tde desktop))
+
+use/x11/xfce: use/x11/xorg
+	@$(call add,THE_LISTS,$(call tags,xfce desktop))
+
+use/x11/cinnamon: use/x11/xorg use/x11/drm
+	@$(call add,THE_LISTS,$(call tags,cinnamon desktop))

image.in/Makefile

@@ -11,6 +11,7 @@ MKI_VER_OPTIMAL = 0.2.0
 include distcfg.mk
 include functions.mk
 
+# check the build environment
 ifeq (,$(realpath $(MKIMAGE_PREFIX)/config.mk))
 $(error please apt-get install mkimage and have a look at QUICKSTART as well)
 endif
@@ -26,9 +27,19 @@ $(info warning: mkimage-$(MKI_VERSION) is suboptimal, consider upgrading)
 $(warning consider upgrading mkimage to $(MKI_VER_OPTIMAL) or better)
 endif
 
+# additional means to reduce havoc in IMAGEDIR
+IMAGE_SORTDIR := $(SORTDIR)
+
 # reconstruct instead of passing yet another variable
-IMAGE_LINK := $(IMAGE_NAME).$(IMAGE_TYPE)
+IMAGE_OUTDIR   := $(IMAGEDIR)$(IMAGE_SORTDIR:%=/%)
-IMAGE_OUTFILE := $(IMAGE_NAME)-$(DATE)-$(ARCH).$(IMAGE_TYPE)
+IMAGE_OUTFILE  := $(IMAGE_NAME)-$(DATE)-$(ARCH).$(IMAGE_TYPE)
+IMAGE_OUTPATH  := $(IMAGE_OUTDIR)/$(IMAGE_OUTFILE)
+IMAGE_RELPATH  := $(IMAGE_SORTDIR:%=%/)$(IMAGE_OUTFILE)
+IMAGE_RELDIR   := $(IMAGE_OUTDIR:$(GLOBAL_BUILDDIR)/%=%)
+IMAGE_LINK     := $(IMAGE_NAME)-latest-$(ARCH).$(IMAGE_TYPE)
+IMAGE_LINKPATH := $(IMAGEDIR)/$(IMAGE_LINK)
+
+### multi-pack can be useful (think netinst iso/tree)
 MKI_PACK_RESULTS = $(IMAGE_PACKTYPE):$(IMAGE_OUTFILE)
 
 # these get opied over as is
@@ -44,7 +55,7 @@ include lib/*.mk
 include $(MKIMAGE_PREFIX)/targets.mk
 
 # specified only for the final image (target-specific)
-pack-image: OUTDIR = $(IMAGEDIR)
+pack-image: OUTDIR = $(IMAGE_OUTDIR)
 pack-image: imagedir
 
 copy-tree: $(SAVE_PROFILE:%=save-profile)
@@ -57,18 +68,20 @@ save-profile:
 .PHONY: imagedir postprocess debug
 
 imagedir:
-	@mkdir -p "$(IMAGEDIR)"
+	@mkdir -p "$(IMAGE_OUTDIR)"
 
 postprocess: | $(addprefix postprocess-,$(sort $(POSTPROCESS_TARGETS)))
-	@OUTPATH="$(IMAGEDIR)/$(IMAGE_OUTFILE)"; \
+	@OUTSIZE="`ls -lh "$(IMAGE_OUTPATH)" | cut -f5 -d' '`"; \
-	OUTSIZE="`ls -lh "$$OUTPATH" | cut -f5 -d' '`"; \
+	echo "** image: $(IMAGE_OUTPATH) [$$OUTSIZE]" >&2 && \
-	echo "** image: $$OUTPATH [$$OUTSIZE]" >&2 && \
+	echo "IMAGE_OUTPATH = $(IMAGE_OUTPATH)" && \
-	ln -sf "$(IMAGE_OUTFILE)" "$(IMAGEDIR)/$(IMAGE_LINK)" && \
+	echo "IMAGE_OUTFILE = $(IMAGE_OUTFILE)" && \
-	ln -sf "$${IMAGEDIR#`pwd`/}" "$(OUT_LINK)"; \
+	ln -sf "$(IMAGE_RELPATH)" "$(IMAGE_LINKPATH)" && \
-	ln -sf "$(IMAGE_LINK)" $(OUT_LINK)/"$(CURRENT_LINK).$(IMAGE_TYPE)"; \
+	ln -sf "$(IMAGE_RELDIR)" "$(OUT_LINK)" && \
+	ln -sf "$(IMAGE_LINK)" "$(IMAGEDIR)/$(CURRENT_LINK).$(IMAGE_TYPE)"; \
 	if [ -n "$(GLOBAL_DEBUG)" ]; then \
-		cp -a build.log "$$OUTPATH.log"; \
+		mkdir -p "$(LOGDIR)"; \
-		cp -a distcfg.mk "$$OUTPATH.cfg"; \
+		cp -a build.log "$(LOGDIR)/$(IMAGE_OUTFILE).log"; \
+		cp -a distcfg.mk "$(LOGDIR)/$(IMAGE_OUTFILE).cfg"; \
 	fi
 
 debug:

image.in/functions.mk

@@ -2,14 +2,16 @@
 PKGDIR := $(GLOBAL_BUILDDIR)/pkg
 
 # duplicated from metaprofile makefiles for the sake of "local" builds
-ARCH ?= $(shell arch | sed 's/i686/i586/')
+ARCH ?= $(shell arch | sed 's/i686/i586/; s/armv.*/arm/')
 DATE ?= $(shell date +%Y%m%d)
 
-# prefix pkglist name with its directory to form a path
+# prefix pkglist name with its directory to form a path (relative/absolute)
-list = $(1:%=$(PKGDIR)/lists/%)
+rlist = $(1:%=lists/%)
+list  = $(addprefix $(PKGDIR)/,$(call rlist,$(1)))
 
-# prefix/suffix group name to form a path
+# prefix/suffix group name to form a path (relative/absolute)
-group = $(1:%=$(PKGDIR)/groups/%.directory)
+rgroup = $(1:%=groups/%.directory)
+group  = $(addprefix $(PKGDIR)/,$(call rgroup,$(1)))
 
 # map first argument (a function) onto second one (an argument list)
 map = $(foreach a,$(2),$(call $(1),$(a)))
@@ -19,5 +21,10 @@ NULL :=
 SPACE := $(NULL) # the officially documented way of getting a space
 
 list2re = $(subst $(SPACE),|,$(strip $(1)))
+
 # args: KMODULES, KFLAVOURS
-kpackages = ^kernel-(image|modules-($(call list2re,$(1))))-($(call list2re,$(2)))$$
+kpackages = $(and $(1),$(2), \
+	^kernel-(image|modules-($(call list2re,$(1))))-($(call list2re,$(2)))$$)
+
+# arg: branding subpackages
+branding = $(and $(1),^branding-$(BRANDING)-($(call list2re,$(1)))$$)

lib/build.mk

@@ -2,6 +2,9 @@
 ANSI_OK   ?= 1;32
 ANSI_FAIL ?= 1;31
 
+MAX_ERRORS = 3
+GOTCHA := ^(((\*\* )?(E:|[Ee]rror|[Ww]arning).*)|(.* (conflicts|Depends:) .*)|(.* (Stop|failed)\.))$$
+
 ifndef MKIMAGE_PROFILES
 $(error this makefile is designed to be included in toplevel one)
 endif
@@ -17,8 +20,10 @@ LOWSPACE = 1024
 # it's also nice to know how long and much it takes
 START += time -f "%E %PCPU %Mk"
 
-# /usr/bin/{i586,x86_64} are setarch(8) symlinks
+ifneq (,$(wildcard $(subst :,/$(ARCH) ,$(PATH):)))
+# /usr/bin/{i586,x86_64} are setarch(8) symlinks but arm is not
 START += $(ARCH)
+endif
 
 # to be passed into distcfg.mk; suggestions are welcome
 IMAGEDIR ?= $(shell \
@@ -30,6 +35,8 @@ IMAGEDIR ?= $(shell \
 	fi; \
 )
 
+LOGDIR ?= $(IMAGEDIR)
+
 # actual build starter
 # NB: our output MUST go into stderr to escape POSTPROC
 build-image: profile/populate
@@ -48,8 +55,10 @@ build-image: profile/populate
 		echo "$(TIME) done (`tail -1 $(BUILDLOG) | cut -f1 -d.`)"; \
 		tail -200 "$(BUILDLOG)" $(SHORTEN) \
 		| GREP_COLOR="$(ANSI_OK)" GREP_OPTIONS="--color=auto" \
-		  grep '^\*\* image: .*' ||:; \
+		  grep '^\*\* image: .*$$' ||:; \
+		RETVAL=0; \
 	else \
+		RETVAL=$$?; \
 		echo -n "$(TIME) failed, see log"; \
 		if [ -z "$(DEBUG)" ]; then \
 			echo ": $(BUILDLOG)" $(SHORTEN); \
@@ -59,9 +68,10 @@ build-image: profile/populate
 		fi; \
 		tail -200 "$(BUILDLOG)" \
 		| GREP_COLOR="$(ANSI_FAIL)" GREP_OPTIONS="--color=auto" \
-		  egrep "^((E:|[Ee]rror|[Ww]arning).*)|(.* Stop\.)$$"; \
+		  egrep -m "$(MAX_ERRORS)" "$(GOTCHA)"; \
 		df -P $(BUILDDIR) | awk 'END { if ($$4 < $(LOWSPACE)) \
 			{ print "NB: low space on "$$6" ("$$5" used)"}}'; \
 	fi; \
 	if [ -n "$(BELL)" ]; then echo -ne '\a'; fi; \
+	exit $$RETVAL; \
 	} >&2