0.9.11-alt1

- persistent icewm

.gear/mkimage-profiles.spec

@@ -1,5 +1,5 @@
 Name: mkimage-profiles
-Version: 0.9.4
+Version: 0.9.11
 Release: alt1
 
 Summary: ALT Linux based distribution metaprofile
@@ -78,6 +78,30 @@ cp -a * %buildroot%mpdir
 %doc %docs/*
 
 %changelog
+* Mon Mar 25 2013 Michael Shigorin <mike@altlinux.org> 0.9.11-alt1
+- persistent icewm
+
+* Mon Mar 18 2013 Michael Shigorin <mike@altlinux.org> 0.9.10-alt1
+- fonts: axios!
+
+* Tue Feb 26 2013 Michael Shigorin <mike@altlinux.org> 0.9.9-alt1
+- regular refactoring
+
+* Tue Feb 19 2013 Michael Shigorin <mike@altlinux.org> 0.9.8.1-alt1
+- works with make-initrd 0.8.1+ (see #28578)
+
+* Mon Feb 18 2013 Michael Shigorin <mike@altlinux.org> 0.9.8-alt1
+- live fixes/tweaks galore
+
+* Mon Feb 11 2013 Michael Shigorin <mike@altlinux.org> 0.9.7-alt1
+- going nightly
+
+* Mon Feb 04 2013 Michael Shigorin <mike@altlinux.org> 0.9.6-alt1
+- assorted fixes
+
+* Mon Jan 21 2013 Michael Shigorin <mike@altlinux.org> 0.9.5-alt1
+- homeros
+
 * Mon Jan 14 2013 Michael Shigorin <mike@altlinux.org> 0.9.4-alt1
 - restricted boot
 

.gear/tags/3f009bb44f9c7ec539ea39e574fd7b4b0b1dd86c

@@ -0,0 +1,6 @@
+object 890172bfedde3d3fda6d2d6fb83941710f5a573a
+type commit
+tag v0.9.10
+tagger Michael Shigorin <mike@altlinux.org> 1363617470 +0200
+
+fonts: axios!

.gear/tags/e0c9f3e51f9d4cf7dd205a0f15586d5866e1eaf2

@@ -1,6 +0,0 @@
-object 29388ef555bcc2811d5713e3b6b8a22413f9e1c7
-type commit
-tag v0.9.3
-tagger Michael Shigorin <mike@altlinux.org> 1356984082 +0200
-
-regular

.gear/tags/list

@@ -1 +1 @@
-e0c9f3e51f9d4cf7dd205a0f15586d5866e1eaf2 v0.9.3
+3f009bb44f9c7ec539ea39e574fd7b4b0b1dd86c v0.9.10

QUICKSTART

@@ -30,11 +30,21 @@ $ git config --global user.name "My Name"
 $ mkdir ~/out
 ----
 
-тестовая сборка (см. тж. lib/distro.mk, doc/params.txt)::
+тестовая сборка::
 ----
 $ make syslinux.iso
 ----
 
+список доступных целей::
+----
+$ make help
+----
+
+переменные, влияющие на результат (подробнее в doc/params.txt)::
+---
+$ make ARCH=i586 APTCONF=~/apt/apt.conf.i586 REPORT=1 ve/generic.tar
+---
+
 ссылки
 ~~~~~~
 - http://www.altlinux.org/tmpfs

bin/mp-commit

@@ -3,13 +3,19 @@
 
 . shell-error
 
+INIT=
+if [ "$1" = "-i" ]; then
+	INIT=yes
+	shift
+fi
+
 [ -d "$1" ] || fatal "$1 is not an existing directory"
 
 if type -t git >&/dev/null && pushd "$1" >/dev/null; then
 	if [ -z "$(git config --global user.name)" ]; then
 		exit 0
 	fi
-	if [ ! -d .git ]; then
+	if [ -n "$INIT" -a ! -d .git ]; then
 		git init -q || fatal "git init failed"
 	fi
 	if [ -n "$(git status -s)" ]; then

conf.d/desktop.mk

@@ -6,20 +6,19 @@ 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 +vmguest
+distro/.desktop-network: distro/.desktop-mini use/stage2/net-eth +vmguest
 	@$(call add,SYSTEM_PACKAGES,fonts-ttf-google-croscore-arimo)
+	@$(call add,BASE_PACKAGES,udev-rule-generator-net sysklogd)
 	@$(call add,BASE_LISTS, \
 		$(call tags,(base || desktop) && (l10n || network)))
 
 distro/.desktop-extra:
 	@$(call add,BASE_LISTS,$(call tags,(archive || base) && (extra)))
 
-distro/tde: distro/.desktop-mini +tde
+distro/kde4-lite: distro/.desktop-mini distro/.desktop-network distro/.desktop-extra +kde4-lite
-	@$(call set,KFLAVOURS,led-ws)
-
-distro/kde-lite: distro/.desktop-mini distro/.desktop-network distro/.desktop-extra +kde
 	@$(call set,KFLAVOURS,std-def)
 
+distro/tde: distro/.desktop-network +tde; @:
 distro/icewm: distro/.desktop-network use/lowmem use/install2/fs +icewm; @:
 distro/ltsp-tde: distro/tde +ltsp; @:
 distro/ltsp-icewm: distro/icewm +ltsp; @:

conf.d/homeros.mk

@@ -0,0 +1,6 @@
+
+ifeq (distro,$(IMAGE_CLASS))
+
+distro/homeros-mini: distro/.live-base use/live/textinstall use/homeros; @:
+
+endif

conf.d/live.mk

@@ -2,16 +2,20 @@
 ifeq (distro,$(IMAGE_CLASS))
 
 distro/dos: distro/.init use/dos use/syslinux/ui/menu; @:
-distro/rescue: distro/.base use/rescue use/efi use/syslinux/ui/menu; @:
+
+distro/rescue: distro/.base use/rescue use/syslinux/ui/menu \
+	use/efi/signed use/efi/refind use/efi/shell; @:
+
 distro/syslinux: distro/.init \
 	use/syslinux/localboot.cfg use/syslinux/ui/vesamenu use/hdt; @:
 
 distro/.live-base: distro/.base use/live/base use/power/acpi/button; @:
-distro/.live-desktop: distro/.base +live use/plymouth/live; @:
+distro/.live-desktop: distro/.base +live use/live/install use/stage2/net-eth \
+	use/plymouth/live use/efi; @:
 distro/.live-desktop-ru: distro/.live-desktop use/live/ru; @:
 
-distro/.live-kiosk: distro/.base use/live/base use/live/autologin \
+distro/.live-kiosk: distro/.base use/live/base use/live/autologin +power \
-	use/syslinux/timeout/1 use/cleanup +power
+	use/syslinux/timeout/1 use/cleanup use/stage2/net-eth
 	@$(call add,LIVE_PACKAGES,fonts-ttf-dejavu)
 	@$(call add,CLEANUP_PACKAGES,'alterator*' 'guile*' 'vim-common')
 
@@ -24,36 +28,43 @@ distro/live-builder-mini: distro/.live-base use/dev/mkimage use/dev \
 	@$(call add,LIVE_PACKAGES,qemu-user-binfmt_misc)
 	@$(call add,LIVE_PACKAGES,zsh sudo)
 
-distro/live-builder: distro/live-builder-mini use/dev/repo
+distro/live-builder: distro/live-builder-mini \
+	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)
 
 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/live/autologin +icewm; @:
+distro/live-icewm: distro/.live-desktop use/x11/lightdm/gtk +icewm; @:
-distro/live-razorqt: distro/.live-desktop use/live/autologin +razorqt; @:
+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; @:
 
 distro/live-rescue: distro/live-icewm use/efi
 	@$(call add,LIVE_LISTS,$(call tags,rescue && (fs || live || x11)))
 	@$(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
+# 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
 	@$(call add,LIVE_LISTS,$(call tags,desktop && (live || network)))
-	@$(call add,LIVE_PACKAGES,livecd-webkiosk)
+	@$(call add,LIVE_PACKAGES,alsa-utils udev-alsa)
 	@$(call add,CLEANUP_PACKAGES,'libqt4*' 'qt4*')
-	@$(call set,KFLAVOURS,led-ws)
+
+distro/live-webkiosk-mini: distro/.live-webkiosk
+	@$(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 +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-webkiosk-chromium: distro/.live-webkiosk
+	@$(call add,LIVE_PACKAGES,livecd-webkiosk-chromium)
+
 distro/live-flightgear: distro/live-icewm use/live/sound use/x11/3d-proprietary
 	@$(call add,LIVE_PACKAGES,FlightGear fgo input-utils)
 	@$(call try,HOMEPAGE,http://www.4p8.com/eric.brasseur/flight_simulator_tutorial.html)
@@ -78,4 +89,6 @@ distro/live-gimp: distro/live-icewm use/x11/3d-free use/live/ru
 	@$(call add,LIVE_PACKAGES,qtfm openssh-clients rsync)
 	@$(call add,LIVE_PACKAGES,design-graphics-sisyphus2)
 
+distro/live-sugar: distro/.live-desktop-ru use/x11/sugar; @:
+
 endif

conf.d/regular.mk

@@ -1,45 +1,77 @@
 # regular build/usage images
 ifeq (distro,$(IMAGE_CLASS))
 
-# TODO: use/plymouth/live when luks+plymouth is done, see also #28255
+# common ground
-distro/.regular-desktop: distro/.base +live +wireless use/live/ru \
+distro/.regular-bare: distro/.base +wireless use/efi/signed use/luks \
-	use/live/install use/live/repo use/x11/3d-free use/systemd \
+	use/memtest use/stage2/net-eth use/kernel/net
-	use/firmware/wireless use/efi/signed use/luks \
-	+vmguest use/memtest use/branding use/syslinux/ui/gfxboot
-	@$(call add,LIVE_PACKAGES,openssh strace alterator-standalone)
-	@$(call add,LIVE_PACKAGES,cpufreq-simple)
-	@$(call add,LIVE_PACKAGES,livecd-online-repo apt-repo)
-	@$(call add,LIVE_PACKAGES,xdg-user-dirs)
-	@$(call add,LIVE_PACKAGES,synaptic-usermode)
-	@$(call add,LIVE_PACKAGES,firefox-ru)
-	@$(call add,LIVE_PACKAGES,net-tools)
-	@$(call add,LIVE_PACKAGES,uvcview)
-	@$(call add,LIVE_PACKAGES,powertop)
-	@$(call add,LIVE_LISTS,$(call tags,rescue extra))
-	@$(call add,THE_BRANDING,indexhtml notes alterator bootloader)
-	@$(call set,KFLAVOURS,std-def)
 	@$(call try,SAVE_PROFILE,yes)
 
-distro/.regular-gtk: distro/.regular-desktop use/x11/gdm2.20; @:
+# WM base target
+distro/.regular-base: distro/.regular-bare +vmguest +live \
+	use/live/ru use/live/install use/live/repo use/live/rw \
+	use/x11/3d-free use/branding
+	@$(call add,LIVE_LISTS,$(call tags,(base || desktop) && regular))
+	@$(call add,LIVE_LISTS,$(call tags,rescue extra))
+	@$(call add,THE_BRANDING,indexhtml notes alterator)
+	@$(call add,THE_BRANDING,graphics)
+
+# DE base target
+# TODO: use/plymouth/live when luks+plymouth is done, see also #28255
+distro/.regular-desktop: distro/.regular-base \
+	use/systemd use/syslinux/ui/gfxboot use/firmware/laptop use/efi/refind
+	@$(call add,LIVE_PACKAGES,fuse-exfat)
+	@$(call add,LIVE_LISTS,domain-client)
+	@$(call add,THE_BRANDING,bootloader)
+	@$(call set,KFLAVOURS,std-def)
+
+distro/.regular-gtk: distro/.regular-desktop use/x11/lightdm/gtk +plymouth; @:
+
+distro/regular-icewm: distro/.regular-base use/x11/lightdm/gtk +icewm
+	@$(call add,LIVE_LISTS,$(call tags,regular icewm))
+	@$(call set,KFLAVOURS,un-def)
+
+distro/regular-wmaker: distro/.regular-desktop use/x11/lightdm/gtk \
+	use/x11/wmaker
+	@$(call add,LIVE_PACKAGES,livecd-install-wmaker)
+	@$(call add,LIVE_PACKAGES,xxkb)
+
+distro/regular-gnustep: distro/regular-wmaker use/x11/gnustep +plymouth
+	@$(call add,THE_BRANDING,graphics)
 
-distro/regular-icewm: distro/.regular-gtk +icewm use/efi/refind; @:
 distro/regular-xfce: distro/.regular-gtk use/x11/xfce; @:
-distro/regular-lxde: distro/.regular-gtk use/x11/lxde; @:
+
+distro/regular-lxde: distro/.regular-gtk use/x11/lxde use/fonts/infinality
+	@$(call add,LIVE_LISTS,$(call tags,desktop nm))
+
+distro/regular-xmonad: distro/.regular-gtk use/x11/xmonad
+	@$(call add,LIVE_PACKAGES,livecd-regular-xmonad)
 
 distro/regular-mate: distro/.regular-gtk
 	@$(call add,LIVE_LISTS,$(call tags,(desktop || mobile) && (mate || nm)))
 
-distro/regular-e17: distro/.regular-gtk use/x11/e17; @:
+distro/regular-e17: distro/.regular-gtk use/x11/e17
-	@$(call add,LIVE_PACKAGES,xterm xorg-xnest)
+	@$(call add,LIVE_PACKAGES,xterm)
-	@$(call add,THE_KMODULES,sound)
 
-distro/regular-cinnamon: distro/.regular-desktop use/x11/cinnamon
+distro/regular-cinnamon: distro/.regular-desktop \
+	use/x11/cinnamon use/fonts/infinality
 	@$(call set,META_VOL_ID,ALT Linux $(IMAGE_NAME)) # see also #28271
 
-distro/regular-tde: distro/.regular-desktop +tde
+distro/regular-gnome3: distro/.regular-desktop use/x11/gnome3; @:
-	@$(call add,LIVE_LISTS,$(call tags,desktop nm))
 
-distro/regular-kde4: distro/.regular-desktop use/x11/kde4 use/x11/kdm4; @:
+distro/regular-tde: distro/.regular-desktop +tde +plymouth
-distro/regular-razorqt: distro/.regular-desktop +razorqt; @:
+	@$(call add,LIVE_LISTS,$(call tags,desktop nm))
+	@$(call add,LIVE_PACKAGES,kdegames kdeedu)
+
+distro/regular-kde4: distro/.regular-desktop use/x11/kde4 use/x11/kdm4 \
+	use/fonts/zerg +plymouth
+	@$(call add,LIVE_LISTS,$(call tags,regular kde4))
+
+distro/regular-razorqt: distro/.regular-desktop +razorqt +plymouth; @:
+
+distro/regular-sugar: distro/.regular-gtk use/x11/sugar; @:
+
+distro/regular-rescue: distro/.regular-bare use/rescue/rw \
+	use/syslinux/ui/menu use/hdt use/efi/refind
+	@$(call set,KFLAVOURS,un-def)
 
 endif

conf.d/server.mk

@@ -9,16 +9,16 @@ distro/server-nano: distro/.server-base \
 	@$(call add,BASE_LISTS,$(call tags,server network))
 	@$(call add,BASE_PACKAGES,dhcpcd cpio)
 
-distro/server-mini: distro/.server-base use/server/mini \
+distro/server-mini: distro/.server-base use/server/mini use/kernel/net \
-	use/cleanup/x11-alterator use/efi
+	use/cleanup/x11-alterator use/efi use/stage2/net-eth
-	@$(call set,KFLAVOURS,led-ws)
+	@$(call add,BASE_PACKAGES,make-initrd-mdadm make-initrd-lvm)
 
 distro/server-ovz: distro/server-mini use/install2/net use/hdt use/rescue \
-	use/firmware/server use/firmware/wireless use/power/acpi/button
+	use/firmware/server use/firmware/cpu use/power/acpi/button +wireless
 	@$(call set,STAGE1_KFLAVOUR,std-def)
 	@$(call set,KFLAVOURS,std-def ovz-el)
-	@$(call add,BASE_KMODULES,rtl8168 rtl8192)
+	@$(call add,MAIN_KMODULES,ipset ipt-netflow opendpi pf_ring)
-	@$(call add,MAIN_KMODULES,ipset ipt-netflow opendpi pf_ring xtables-addons)
+	@$(call add,MAIN_KMODULES,xtables-addons)	# t6/branch
 	@$(call add,MAIN_KMODULES,drbd83 kvm)
 	@$(call add,BASE_LISTS,ovz-server)
 	@$(call add,MAIN_GROUPS,dns-server http-server ftp-server kvm-server)

conf.d/test.mk

@@ -19,12 +19,13 @@ distro/live-gns3: distro/live-icewm
 	@$(call add,LIVE_LISTS,gns3)
 	@$(call add,LIVE_KMODULES,kvm virtualbox)
 
-distro/live-efi: distro/live-install use/efi
-	@$(call set,KFLAVOURS,un-def)	### CONFIG_FB_EFI
-
 distro/icewm-efi: distro/icewm use/efi/debug use/firmware
 	@$(call add,INSTALL2_PACKAGES,strace)
 
+distro/razorqt-kz: distro/regular-razorqt
+	@$(call set,GLOBAL_BOOT_LANG,kk_KZ)
+	@$(call add,LIVE_PACKAGES,hunspell-kk)
+
 distro/server-systemd: distro/server-mini use/systemd
 	@$(call set,KFLAVOURS,std-def)
 

doc/.gitignore

@@ -0,0 +1,4 @@
+mkimage-profiles.chunked
+docbook-xsl.css
+mkimage-profiles.pdf
+mkimage-profiles.html

doc/assumptions.txt

@@ -2,7 +2,12 @@
 
 NB: пути приводятся от верхнего уровня; проект в целом предполагает
 ALT Linux 6.0+ и GNU make 3.81+ (на которых и разрабатывается),
-но может быть портирован вместе с mkimage.
+но может быть портирован вместе с mkimage.  Если что-либо не работает
+или не собирается, стоит проверить на Sisyphus (mkimage, make, hasher,
+собственно пакетная база), поскольку именно на нём происходит основная
+разработка mkimage-profiles.  Сломанная сборка на текущем стабильном
+бранче считается ошибкой и подлежит исправлению, если оно технически
+возможно на базе этого бранча.
 
 * lib/report.mk
 ** ожидает, что каждая подлежащая трассированию цель каждого

doc/params.txt

@@ -61,7 +61,7 @@
 ** см. ../features.in/live/generate.mk (тж. по умолчаниям)
 
 * ISOHYBRID
-** включает постобработку ISO-образа isohybrid
+** включает создание гибриднго ISO-образа
 ** значение: пусто (по умолчанию) либо любая строка
 ** см. ../features.in/pack/config.mk
 

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

@@ -8,16 +8,13 @@ BOOT_SYSI := $(META_SYSTEM_ID)
 BOOT_PUBL := $(META_PUBLISHER)
 BOOT_PREP := $(META_PREPARER)
 BOOT_APPI := $(META_APP_ID)
-BOOT_VOLI := $(META_VOL_ID)
+BOOT_VOLI := $(shell echo $(META_VOL_ID) | cut -c1-32)
 BOOT_VOLS := $(META_VOL_SET)
 BOOT_BIBL := $(META_BIBLIO)
 BOOT_ABST := $(META_ABSTRACT)
 
 BOOT_TYPE := isolinux
 
-# 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)
 

features.in/build-distro/scripts.d/01-isosort

@@ -1,14 +0,0 @@
-#!/bin/sh
-# provide mkisofs with image contents sort order hints
-
-### split over features or leave in a single piece?
-
-# NB: only a single space/tab in between, no trailing whitespace
-cat > /tmp/isosort <<__EOF__
-ALTLinux 0
-Metadata 100
-altinst 700
-rescue 800
-live 900
-syslinux 1000
-__EOF__

features.in/efi/config.mk

@@ -1,3 +1,5 @@
++efi: use/efi; @:
+
 ifeq (x86_64,$(ARCH))
 
 EFI_LISTS := $(call tags,base efi)
@@ -7,14 +9,24 @@ use/efi:
 	@$(call set,MKI_VER_MINIMAL,0.2.5)	# see #28219
 	@$(call add,THE_LISTS,$(EFI_LISTS))
 	@$(call add,RESCUE_LISTS,$(EFI_LISTS))
-	@$(call add,INSTALL2_PACKAGES,dosfstools)
+	@$(call add,THE_PACKAGES,$$(EFI_SHELL))
+	@$(call add,RESCUE_PACKAGES,refind $$(EFI_SHELL))
+	@$(call add,INSTALL2_PACKAGES,dosfstools fatresize)
 	@$(call try,EFI_BOOTLOADER,elilo)	# default one
 
 use/efi/refind: use/efi
 	@$(call set,EFI_BOOTLOADER,refind)
 
 use/efi/signed: use/efi
+	@$(call set,MKI_VER_MINIMAL,0.2.7)	# refind->elilo handoff
 	@$(call set,EFI_CERT,altlinux)
+	@$(call add,THE_PACKAGES,shim-signed)
+	@$(call set,EFI_SHELL,efi-shell-signed)	# even more useful
+	@$(call add,RESCUE_PACKAGES,refind-signed)
+	@$(call add,RESCUE_PACKAGES,openssl sbsigntools)
+
+use/efi/shell: use/efi
+	@$(call try,EFI_SHELL,efi-shell)
 
 use/efi/debug: use/efi
 	@$(call add,STAGE2_PACKAGES,efibootmgr gdisk)
@@ -23,6 +35,6 @@ use/efi/debug: use/efi
 else
 
 # ignore on an unsupported target arch but make it hybrid at least
-use/efi use/efi/refind use/efi/signed use/efi/debug: use/isohybrid
+use/efi use/efi/refind use/efi/signed use/efi/shell use/efi/debug: use/isohybrid
 
 endif

features.in/firmware/config.mk

@@ -6,6 +6,12 @@ use/firmware:
 	@$(call add_feature)
 	@$(call add,SYSTEM_PACKAGES,firmware-linux)
 
+use/firmware/full: use/firmware/server use/firmware/laptop
+
+use/firmware/cpu: use/firmware
+	@$(call add,THE_PACKAGES,firmware-amd-ucode)
+	@$(call add,THE_PACKAGES,microcode-data-intel microcode_ctl)
+
 use/firmware/server: use/firmware
 	@$(call add,SYSTEM_PACKAGES,firmware-aic94xx-seq)
 	@$(call add,THE_PACKAGES_REGEXP,firmware-ql.*)
@@ -17,9 +23,12 @@ use/firmware/wireless: use/firmware
 	@$(call add,THE_KMODULES,bcmwl ndiswrapper)
 	@$(call add,THE_PACKAGES,firmware-acx100)
 	@#$(call add,THE_PACKAGES,firmware-i2400m)
-	@$(call add,THE_PACKAGES_REGEXP,firmware-carl9170.*)
+	@#$(call add,THE_PACKAGES_REGEXP,firmware-carl9170.*)
 	@$(call add,THE_PACKAGES_REGEXP,firmware-prism.*)
 	@$(call add,THE_PACKAGES_REGEXP,firmware-ipw.*)
 	@#$(call add,THE_PACKAGES_REGEXP,firmware-iwl.*)
 	@#$(call add,THE_PACKAGES_REGEXP,firmware-rt.*)
 	@$(call add,THE_PACKAGES_REGEXP,firmware-zd.*)
+
+use/firmware/laptop: use/firmware/wireless use/firmware/cpu
+	@$(call add,KMODULES,acpi_call)

features.in/fonts/config.mk

@@ -0,0 +1,15 @@
+use/fonts:
+	@$(call add_feature)
+	@$(call xport,FONT_FEATURES_ENABLE)
+	@$(call xport,FONT_FEATURES_DISABLE)
+
+# just stating that kernels and font habits are pretty individual
+use/fonts/zerg: use/fonts
+	@$(call set,FONT_FEATURES_ENABLE,antialias lcdfilter-default \
+		hinting style-full sub-pixel-rgb)
+	@$(call set,FONT_FEATURES_DISABLE,no-antialias lcdfilter-none \
+		unhinted no-sub-pixel)
+
+# nothing configured to add_feature, let's skip that this time
+use/fonts/infinality:
+	@$(call add,THE_PACKAGES,libfreetype-infinality fontconfig-infinality)

features.in/fonts/stage2/image-scripts.d/50-fontconfig

@@ -0,0 +1,33 @@
+#!/bin/sh
+# fontconfig-config-config
+
+verbose="${GLOBAL_VERBOSE:+-v}"
+verbose() { [ -z "$GLOBAL_VERBOSE" ] || echo "HOOK: 50-fontconfig: $@"; }
+verbose "has started"
+
+CONF_DIR="/etc/fonts/conf.d"
+AVAIL_DIR="/etc/fonts/conf.avail"
+
+list() { ls "$1"/??-"$2".conf 2>/dev/null; }
+
+enable() {
+	for i in "$@"; do
+		if ! list "$CONF_DIR" "$i"; then
+			AVAIL="$(list "$AVAIL_DIR" "$i" | head -1)"
+			if [ -n "$AVAIL" ]; then
+				ln -s $verbose "$AVAIL" "$CONF_DIR/$CONF_ADD"
+			fi
+		fi
+	done
+}
+
+disable() {
+	for i in "$@"; do
+		$(list "$CONF_DIR" "$i") | xargs -r rm -f $verbose --
+	done
+}
+
+disable $GLOBAL_FONT_FEATURES_DISABLE
+enable  $GLOBAL_FONT_FEATURES_ENABLE
+
+:

features.in/homeros/README

@@ -0,0 +1,5 @@
+Каталог содержит основную feature для создания адаптированного
+дистрибутива Homeros. Это промежуточный вариант, при помощи которого
+можно получить минимальный разговаривающий образ, но, возможно, помимо
+его дальнейшего естественного развития требуется ещё осмысление с
+точки зрения идей mkimage-profiles.

features.in/homeros/config.mk

@@ -0,0 +1,10 @@
+use/homeros:
+	@$(call add_feature)
+#	@$(call set,BRANDING,simply-linux)
+#	@$(call add,THE_BRANDING,menu xfce-settings)
+	@$(call add,THE_LISTS,homeros/voiceman)
+	@$(call add,THE_LISTS,homeros/homeros)
+	@$(call add,THE_LISTS,homeros/tts)
+	@$(call add,THE_LISTS,homeros/yasr)
+	@$(call add,THE_LISTS,homeros/tools)
+#	@$(call set,META_VOL_SET,Homeros)

features.in/homeros/live/image-scripts.d/10-amixer

@@ -0,0 +1,13 @@
+#!/bin/sh
+
+cat <<EOF > /etc/rc.d/rc.local
+#!/bin/sh
+
+amixer set Master 75%
+amixer set Master toggle
+amixer set PCM 75%
+amixer set PCM toggle
+
+EOF
+
+chmod 755 /etc/rc.d/rc.local

features.in/homeros/live/image-scripts.d/10-console-keyboard-ru

@@ -0,0 +1,8 @@
+#!/bin/sh -e
+
+echo 'KEYTABLE=ruwin_ct_sh-UTF-8' > /etc/sysconfig/keyboard
+cat <<EOF > /etc/sysconfig/i18n
+SYSFONT=UniCyr_8x16
+LANG=ru_RU.UTF-8
+SUPPORTED=ru_RU.UTF-8
+EOF

features.in/homeros/live/image-scripts.d/10-rhvoice

@@ -0,0 +1,4 @@
+#!/bin/sh -e
+
+/bin/ln -s /etc/tts.d/rhvoice-en.voiceman /etc/voiceman.d/rhvoice-en.output
+/bin/ln -s /etc/tts.d/rhvoice.voiceman /etc/voiceman.d/rhvoice.output

features.in/homeros/live/image-scripts.d/10-ssh

@@ -0,0 +1,3 @@
+#!/bin/sh -e
+
+chkconfig sshd on

features.in/homeros/live/image-scripts.d/10-sudo

@@ -0,0 +1,6 @@
+#!/bin/sh -e
+
+mkdir -p /etc/sudo.d
+chmod 700 /etc/sudo.d
+control su public
+control sudo public

features.in/homeros/live/image-scripts.d/10-voiceman

@@ -0,0 +1,3 @@
+#!/bin/sh -e
+
+chkconfig voiceman on

features.in/homeros/live/image-scripts.d/20-altlinux-user

@@ -0,0 +1,5 @@
+#!/bin/sh -e
+
+useradd altlinux
+echo 'altlinux ALL=NOPASSWD:ALL' > /etc/sudo.d/altlinux
+chmod 400 /etc/sudo.d/altlinux

features.in/homeros/live/image-scripts.d/30-autologin

@@ -0,0 +1,13 @@
+#!/bin/sh
+
+subst s/'^\(1:2345:respawn.*\)$'/'#\1'/ /etc/inittab 
+cat <<EOF >> /etc/inittab
+# yasr is always available on 1-st console;
+yasr:2345:respawn:/bin/openvt -w -f -c 1 -- su -l altlinux -c /usr/local/bin/yasr-with-linux-term
+EOF
+    cat <<EOF > /usr/local/bin/yasr-with-linux-term
+#!/bin/sh
+TERM=linux /usr/bin/yasr
+exit \$?
+EOF
+    chmod 755 /usr/local/bin/yasr-with-linux-term

features.in/isohybrid/README

@@ -1,6 +1,6 @@
-Эта фича производит постобработку ISO-образа утилитой isohybrid
+Эта фича обеспечивает формирование ISO-образа с добавлением липовой
-с целью обеспечения возможности его загрузки как с CD/DVD,
+таблицы разделов с целью обеспечения возможности его загрузки
-так и с USB-флэшки.
+как с CD/DVD, так и с USB-флэшки.
 
 Можно указать в цепочке зависимостей дистрибутива явно с тем,
 чтобы гарантировать гибридный вид образа, либо запросить включение
@@ -8,5 +8,5 @@
 (ISOHYBRID=1, см. ../pack/config.mk).
 
 Обратите внимание: в propagator до 20101130-alt15 поддержка
-автоматической загрузки с флэш-носителя и при этом ISO-образа
+автоматической загрузки с флэш-носителя, содержащего ISO-образ,
 отсутствует, что компенсируется специальной обработкой в gfxboot.

features.in/isohybrid/config.mk

@@ -1,3 +1,4 @@
 use/isohybrid:
 	@$(call add_feature)
-	@$(call add,POSTPROCESS_TARGETS,80isohybrid)
+	@$(call try,ISOHYBRID,1)
+	@$(call set,MKI_VER_MINIMAL,0.2.5)

features.in/isohybrid/lib/80-isohybrid.mk

@@ -1,4 +0,0 @@
-CHROOT_PACKAGES += syslinux
-
-postprocess-80isohybrid:
-	@isohybrid "$(IMAGEDIR)/$(IMAGE_OUTFILE)"

features.in/kernel/README

@@ -1 +1,7 @@
-Эта фича привносит код, имеющий смысл при добавлении в образ ядра.
+Эта фича привносит код, имеющий смысл при добавлении в образ ядра,
+и задаёт начальный вариант такового.
+
+Также занимается складированием наборов имён пакетов kernel-modules-*
+с тем, чтобы избавить релиз-менеджеров от необходимости учитывать
+полные списки и точные имена дополнительных модулей для поддержки,
+скажем, Ethernet.

features.in/kernel/config.mk

@@ -1,4 +1,13 @@
-###
+# choose std kernel flavour for max RAM size support
+ifeq (i586,$(ARCH))
+BIGRAM := std-pae
+else
+BIGRAM := std-def
+endif
+
 use/kernel:
 	@$(call add_feature)
-	@$(call set,KFLAVOURS,un-def)
+	@$(call set,KFLAVOURS,std-def)
+
+use/kernel/net:
+	@$(call add,THE_KMODULES,e1000e igb r8168 rtl8168)

features.in/live/config.mk

@@ -9,12 +9,21 @@ 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)))
 
+# rw slice, see http://www.altlinux.org/make-initrd-propagator and #28289
+ifeq (,$(EFI_BOOTLOADER))
+use/live/rw: use/live use/syslinux
+	@$(call add,SYSLINUX_CFG,live_rw)
+else
+use/live/rw: use/live; @:
+endif
+
 # a very simplistic one
 use/live/x11: use/live use/firmware use/x11/xorg
 	@$(call add,LIVE_PACKAGES,xinit)
 
 # optimized out: use/x11/xorg
-use/live/desktop: use/live/base use/x11/wacom use/live/sound +vmguest +power
+use/live/desktop: use/live/base use/x11/wacom use/live/sound \
+	+vmguest +power +efi
 	@$(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)
@@ -22,9 +31,14 @@ use/live/desktop: use/live/base use/x11/wacom use/live/sound +vmguest +power
 	@$(call add,SYSLINUX_CFG,localboot)
 
 # preconfigure apt for both live and installed-from-live systems
-use/live/repo:
+use/live/repo: use/live
-	@$(call add,LIVE_PACKAGES,livecd-online-repo)
 	@$(call add,LIVE_PACKAGES,installer-feature-online-repo)
+	@$(call try,LIVE_REPO,http/alt)
+	@$(call xport,LIVE_REPO)
+
+# preconfigure apt in runtime (less reliable)
+use/live/repo/online:
+	@$(call add,LIVE_PACKAGES,livecd-online-repo)
 
 # alterator-based permanent installation
 use/live/install: use/metadata use/syslinux/localboot.cfg

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

@@ -12,8 +12,11 @@ switch() {
 	esac
 
 	{
-		[ ! -x /bin/systemctl ] || /bin/systemctl $sc $1.service
+		[ ! -x /bin/systemctl ] ||
-		[ ! -x /sbin/chkconfig ] || /sbin/chkconfig $1 $cc
+			/bin/systemctl --no-reload $sc $1.service
+
+		[ ! -x /sbin/chkconfig ] ||
+			/sbin/chkconfig $1 $cc
 	} 2>/dev/null
 }
 
@@ -30,10 +33,16 @@ livecd-hostname
 livecd-save-nfs
 livecd-setauth
 livecd-setlocale
+livecd-net-eth
+livecd-install-wmaker
 network
 NetworkManager
+connman
 random
 rpcbind
+plymouth
+avahi-daemon
+cpufreq-simple
 "
 
 # NB: dnsmasq: https://bugzilla.altlinux.org/show_bug.cgi?id=18799

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

@@ -1,4 +1,4 @@
-#!/bin/sh -e
+#!/bin/sh
 
 if [ ! -x /usr/bin/X ]; then
 	echo "SKIP autologin: X not installed" >&2
@@ -15,6 +15,28 @@ add_nopasswdlogin_group()
 	gpasswd -a "$USER" nopasswdlogin
 }
 
+BAK=".save"
+backup() {
+	[ -f "$1" -a ! -f "$1$BAK" ] || return 1
+	cp -av "$1" "$1$BAK"
+}
+
+restore_later() {
+	[ -n "$1" ] || return 0
+
+	local prefix="/usr/lib/alterator/hooks/livecd-preinstall.d"
+	[ -d "$prefix" ] || mkdir -p "$prefix"
+
+	local hook="$prefix/51-disable-autologin-again.sh"
+	[ -s "$hook" ] || cat >> "$hook" <<- EOF
+	#!/bin/sh
+	. livecd-functions
+	EOF
+
+	echo mv -v "\$destdir$1$BAK" "\$destdir$1" >> "$hook"
+	chmod +x "$hook"
+}
+
 ## setup runlevel
 INITTAB=/etc/inittab
 if [ -f "$INITTAB" ]; then
@@ -23,39 +45,62 @@ if [ -f "$INITTAB" ]; then
 fi
 
 ## autologin^2
+AUTOLOGIN_CFG=/etc/sysconfig/autologin
 if [ -x /usr/sbin/autologin ]; then
-	cat << E_O_F >> /etc/sysconfig/autologin
+	backup "$AUTOLOGIN_CFG"
-USER=$USER
+	cat >> "$AUTOLOGIN_CFG" <<- EOF
-AUTOLOGIN=yes
+	USER=$USER
-E_O_F
+	AUTOLOGIN=yes
+	EOF
+	restore_later "$AUTOLOGIN_CFG"
 fi
 
 ## lightdm autologin
 LIGHTDM_CONF=/etc/lightdm/lightdm.conf
 if [ -f "$LIGHTDM_CONF" ]; then
+	backup "$LIGHTDM_CONF"
 	sed -i \
 		-e "s/^#\(autologin-user=\).*$/\1$USER/" \
 		-e "s/^#\(autologin-user-timeout=0\)/\1/" \
 		"$LIGHTDM_CONF"
+	backup "/etc/group"
 	add_nopasswdlogin_group lightdm ||:
+
+	restore_later "$LIGHTDM_CONF"
+	restore_later "/etc/group"
 fi
 
 ## gdm2 autologin
 GDM_CONF=/etc/X11/gdm/custom.conf
 if [ -f "$GDM_CONF" ]; then
+	backup "$GDM_CONF"
 	sed -i -e '/\[daemon\]/aAutomaticLoginEnable=true\nAutomaticLogin='$USER \
 		"$GDM_CONF"
+	backup "/etc/group"
 	add_nopasswdlogin_group gdm ||:
+
+	restore_later "$GDM_CONF"
+	restore_later "/etc/group"
 fi
 
 autologin_kdm() {
+	backup "$1"
 	sed -i \
 		-e '/AutoLoginEnable/ s,^.*$,AutoLoginEnable=true,' \
 		-e '/AutoLoginUser/ s,^.*$,AutoLoginUser='$USER',' \
 		"$1"
+	restore_later "$1"
 }
 
 ## kdm3 autologin
+# FIXME: tde packages have kdmrc in /usr via an absolute symlink :-(
+KDM_ETC=/etc/X11/kdm
+KDM_USR=/usr/share/kde/config/kdm
+if [ "$(readlink "$KDM_ETC")" = "$KDM_USR" ]; then
+	rm -f "$KDM_ETC"
+	ln -s ../.."$KDM_USR" "$KDM_ETC"
+fi
+
 KDMRC=/etc/X11/kdm/kdmrc
 if [ -f "$KDMRC" ]; then autologin_kdm "$KDMRC"; fi
 
@@ -67,22 +112,25 @@ if [ -f "$KDMRC" ]; then autologin_kdm "$KDMRC"; fi
 # 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"
+	backup "$NODM_RC"
-export NODM_USER=$USER
+	cat >> "$NODM_RC" <<- EOF
-E_O_F
+	export NODM_USER=$USER
+	EOF
+	restore_later "$NODM_RC"
 else
 	exit 0
 fi
 
-# FIXME: drop when #27449 is fixed
+# FIXME: drop since #27449 is fixed
 PREFDM=/etc/X11/prefdm
 if [ -f "$PREFDM" ] && ! grep -q nodm "$PREFDM"; then
+	backup "$PREFDM"
 	sed -i \
 		-e '/AUTOLOGIN_EXE=/ s,^.*$,AUTOLOGIN_EXE='$NODM_EXE',' \
 		-e '/AUTOLOGIN_CFG=/ s,^.*$,AUTOLOGIN_CFG='$NODM_RC',' \
 		"$PREFDM"
+	restore_later "$PREFDM"
 fi
 
 # FIXME: drop when #27451 is fixed

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

@@ -23,6 +23,18 @@ DOMAINNAME="localdomain"
 verbose "Init /etc/hosts with 127.0.0.1 localhost"
 echo "127.0.0.1 localhost localhost.localdomain" > /etc/hosts
 
+prefix="/etc/net/ifaces"
+
+# seems like aufs bug on O_TRUNC writes:
+#   aufs au_lkup_neg:267:kworker/0:2[998]:
+#   I/O Error, resolv.conf should be negative on b0.
+# OTOH lo interface is now brought up in initrd
+# so this shoudn't really matter
+if [ -d "$prefix"/lo ]; then
+	echo 'nameserver 8.8.8.8' >> "$prefix"/lo/resolv.conf
+fi
+find /var -name resolv.conf -or -name nsswitch.conf -delete
+
 netcfg="/etc/sysconfig/network"
 
 verbose "Enable networking, set hostname to $HOSTNAME, domainname to $DOMAINNAME"
@@ -30,21 +42,22 @@ shell_config_set "$netcfg" NETWORKING yes
 shell_config_set "$netcfg" HOSTNAME "$HOSTNAME"
 shell_config_set "$netcfg" DOMAINNAME "$DOMAINNAME"
 
-
+# NB: see also #28484 and livecd-net-eth for runtime configuration
-if  [ -x /usr/sbin/NetworkManager ] ; then
+defcfg="$prefix/default/options-eth"
-	verbose "Setup defaults for NetworkManager"
+if  [ -x /usr/sbin/NetworkManager -o -x /usr/sbin/connmand ] ; then
-	shell_config_set /etc/net/ifaces/default/options-eth NM_CONTROLLED yes
+	verbose "Setup defaults for NetworkManager/connman"
-	shell_config_set /etc/net/ifaces/default/options-eth DISABLED yes
+	shell_config_set "$defcfg" NM_CONTROLLED yes
-	shell_config_set /etc/net/ifaces/default/options-eth BOOTPROTO dhcp
+	shell_config_set "$defcfg" DISABLED yes
+	shell_config_set "$defcfg" BOOTPROTO dhcp
 else
 	# attempt to autoconfigure ethernet by etcnet
-	if [ -x /sbin/dhcpcd -o -x /sbin/dhclient ]; then
+	if [ -x /lib/udev/write_net_rules ] &&
+	   [ -x /sbin/dhcpcd -o -x /sbin/dhclient ]; then
 		verbose "configuring DHCP for eth0"
-
+		mkdir -p "$prefix"/eth0 && {
-		mkdir -p /etc/net/ifaces/eth0 && {
 		echo TYPE=eth
 		echo BOOTPROTO=dhcp
-		} > /etc/net/ifaces/eth0/options
+		} > "$prefix"/eth0/options
 	else
 		verbose "NOT configuring eth0 for DHCP"
 	fi

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

@@ -0,0 +1,10 @@
+#!/bin/sh
+# unconditionally enable online repository
+
+[ -n "$GLOBAL_LIVE_REPO" ] || exit 0
+
+PROTO="${GLOBAL_LIVE_REPO%/*}"	# http, ftp, rsync
+MIRROR="${GLOBAL_LIVE_REPO#*/}"	# alt, heanet, kiev, yandex, ...
+
+sed -i "s,^#\(rpm \[alt\] ${PROTO:-http}.*\),\1," \
+	"/etc/apt/sources.list.d/${MIRROR:-alt}.list"

features.in/ltsp/config.mk

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

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

@@ -35,6 +35,6 @@ metadata-.base:
 metadata: metadata-.base
 	@mkdir -p $(METADIR); \
 	tar -C $(PKGDIR) -cvf - \
-		$(call rlist,$(MAIN_GROUPS) .base) \
+		$(call rlist,$(THE_GROUPS) $(MAIN_GROUPS) .base) \
-		$(call rgroup,$(MAIN_GROUPS)) \
+		$(call rgroup,$(THE_GROUPS) $(MAIN_GROUPS)) \
 	> $(METADIR)/pkg-groups.tar

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

@@ -1,3 +1,9 @@
 #!/bin/sh
 
+CONFIG=/etc/plymouth/plymouthd.conf
+
+if [ -f "$CONFIG" ]; then
+	grep -q '^Theme=' "$CONFIG" || sed -i 's/#\([T\[]\)/\1/' "$CONFIG"
+fi
+
 cp -a /usr/share/plymouth/default-install-duration /var/lib/plymouth/boot-duration

features.in/power/config.mk

@@ -8,7 +8,7 @@ use/power:
 
 # modern power management
 use/power/acpi: use/power
-	@$(call add,COMMON_PACKAGES,acpid)
+	@$(call add,COMMON_PACKAGES,acpid acpi)
 
 use/power/acpi/button: use/power/acpi
 	@$(call add,COMMON_PACKAGES,acpid-events-power)

features.in/rescue/README

@@ -1,3 +1,9 @@
 Эта фича дополняет базовый "живой" образ второй стадии
 специфическими для спасательного образа настройками
 и скриптовыми хуками.
+
+Цель use/rescue/rw добавляет предварительно настроенный
+пункт загрузки, который в случае "просто гибридного"
+(не GPT) ISO, записанного на USB Flash, обеспечит создание
+и монтирование дополнительного раздела для сохранения данных
+между сессиями.

features.in/rescue/config.mk

@@ -1,5 +1,14 @@
 use/rescue: use/stage2 sub/stage2@rescue use/syslinux/sdab.cfg \
-	use/firmware/server use/firmware/wireless
+	use/firmware/full +wireless
 	@$(call add_feature)
 	@$(call add,RESCUE_LISTS, openssh \
-		$(call tags,(base || extra) && (rescue || network)))
+		$(call tags,(base || extra || server || misc) && \
+			(rescue || network || security)))
+
+# rw slice, see also use/live/rw (don't use simultaneously)
+ifeq (,$(EFI_BOOTLOADER))
+use/rescue/rw: use/rescue use/syslinux
+	@$(call add,SYSLINUX_CFG,rescue_rw)
+else
+use/rescue/rw: use/rescue; @:
+endif

features.in/slinux/config.mk

@@ -15,7 +15,6 @@ use/slinux: use/x11/xfce use/x11/gdm2.20
 	@$(call add,THE_LISTS,$(call tags,base l10n))
 	@$(call set,META_VOL_SET,Simply Linux)
 
-use/slinux/full: use/isohybrid use/slinux use/systemd \
+use/slinux/full: use/isohybrid use/slinux use/systemd +wireless \
-	use/firmware/wireless use/branding/complete \
+	use/branding/complete use/x11/drm use/x11/3d-proprietary
-	use/x11/drm use/x11/3d-proprietary
 	@$(call add,THE_PACKAGES,apt-conf-sisyphus)

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

@@ -18,12 +18,12 @@ sshd
 "
 
 for i in $ENABLE;  do
-	[ -x /bin/systemctl ] && /bin/systemctl enable ${i}.service
+	[ -x /bin/systemctl ] && /bin/systemctl --no-reload 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 /bin/systemctl ] && /bin/systemctl --no-reload disable ${i}.service
 	[ -x /sbin/chkconfig ] && /sbin/chkconfig $i off
 done
 :

features.in/stage2/config.mk

@@ -6,6 +6,11 @@ use/stage2: sub/stage1
 use/stage2/kms:
 	@$(call add,STAGE1_KMODULES_REGEXP,drm.*)
 
+# eth0 instead of enp0s3
+use/stage2/net-eth: use/stage2
+	@$(call add,STAGE1_PACKAGES,udev-rule-generator-net)
+	@$(call add,STAGE2_PACKAGES,udev-rule-generator-net livecd-net-eth)
+
 # 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/10-initrd-base

@@ -2,5 +2,13 @@
 # prepare base make-initrd configuration for stage1
 # see also http://www.altlinux.org/Make-initrd-propagator
 
-sed -i 's/AUTODETECT/#&/' /etc/initrd.mk
+MAKE_INITRD_VER="`make-initrd -V \
+	| sed -rn 's/^make-initrd version ([0-9.]+)/\1/p'`"
+
+if [ "`rpmvercmp "$MAKE_INITRD_VER" "0.8.1"`" != "-1" ]; then
+	echo 'AUTODETECT =' >> /etc/initrd.mk	# make-initrd >= 0.8.1
+else
+	sed -i 's/AUTODETECT/#&/' /etc/initrd.mk	# see also #28578
+fi
+
 echo 'FEATURES += propagator' >> /etc/initrd.mk

features.in/syslinux/cfg.in/32live_rw.cfg

@@ -0,0 +1,5 @@
+label session
+  menu label LiveCD with ^sessions support
+  kernel alt0/vmlinuz
+  append initrd=alt0/full.cz fastboot live showopts automatic=method:cdrom ramdisk_size=@live_size@ stagename=live live_rw vga=0x314 @bootargs@
+

features.in/syslinux/cfg.in/82rescue_rw.cfg

@@ -0,0 +1,6 @@
+label rescue_session
+  menu label Rescue with sess^ions support
+  kernel alt0/vmlinuz
+  append initrd=alt0/full.cz fastboot live showopts automatic=method:cdrom ramdisk_size=@rescue_size@ stagename=rescue live_rw
+
+

features.in/syslinux/generate.mk

@@ -82,7 +82,7 @@ bootargs: clean
 
 clean: copy
 	@if [ "$(SYSLINUX_UI)" = gfxboot ]; then \
-		sed -i "s,\^,," $(DSTDIR)/*.cfg; \
+		sed -i "s/\^//;/menu label /d" $(DSTDIR)/*.cfg; \
 	fi
 
 copy: prep

features.in/vmguest/config.mk

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

features.in/wireless/config.mk

@@ -1,6 +1,8 @@
-+wireless: use/wireless; @:
++wireless: use/wireless/full; @:
 
 use/wireless:
 	@$(call add_feature)
-	@$(call add,THE_KMODULES,bcmwl rt3070 staging)
+	@$(call add,THE_KMODULES,bcmwl rt3070 rtl8192 staging)
-	@$(call add,THE_PACKAGES,wireless-tools rfkill)
+	@$(call add,THE_PACKAGES,wireless-tools rfkill crda iw)
+
+use/wireless/full: use/wireless use/firmware/wireless; @:

features.in/x11/config.mk

@@ -1,7 +1,8 @@
 +icewm: use/x11/icewm; @:
-+razorqt: use/x11/razorqt use/x11/lightdm/qt; @:
++razorqt: use/x11/razorqt use/x11/lightdm/razorqt; @:
++xmonad: use/x11/xmonad; @:
 +tde: use/x11/tde use/x11/kdm; @:
-+kde: use/x11/kde use/x11/kdm4; @:
++kde4-lite: use/x11/kde4-lite use/x11/kdm4; @:
 
 use/x11/xorg:
 	@$(call add_feature)
@@ -16,7 +17,7 @@ use/x11/drm: use/x11/xorg
 use/x11/3d-free: use/x11/drm
 	@$(call add,THE_KMODULES,drm-nouveau)
 
-### fglrx is broken with xorg-1.12 so far
+### fglrx is broken with xorg-1.13 so far
 use/x11/3d-proprietary: use/x11/xorg
 	@$(call add,THE_KMODULES,fglrx nvidia)
 	@$(call add,THE_PACKAGES,nvidia-settings nvidia-xconfig)
@@ -31,7 +32,8 @@ use/x11/xdm: use/x11/runlevel5
 	@$(call add,THE_PACKAGES,xdm installer-feature-no-xconsole-stage3)
 
 ### : some set()-like thing might be better?
-use/x11/lightdm/qt use/x11/lightdm/gtk: use/x11/lightdm/%: use/x11/runlevel5
+use/x11/lightdm/gtk use/x11/lightdm/qt use/x11/lightdm/razorqt \
+	use/x11/lightdm/kde: use/x11/lightdm/%: use/x11/runlevel5
 	@$(call add,THE_PACKAGES,lightdm-$*-greeter)
 
 use/x11/kdm: use/x11/runlevel5
@@ -52,8 +54,8 @@ use/x11/razorqt: use/x11/xorg
 use/x11/tde: use/x11/xorg
 	@$(call add,THE_LISTS,$(call tags,tde desktop))
 
-use/x11/kde: use/x11/xorg
+use/x11/kde4-lite: use/x11/xorg
-	@$(call add,THE_LISTS,$(call tags,kde desktop))
+	@$(call add,THE_LISTS,$(call tags,kde4 desktop))
 
 use/x11/kde4: use/x11/xorg
 	@$(call add,THE_PACKAGES,kde4-default)
@@ -64,8 +66,27 @@ use/x11/xfce: use/x11/xorg
 use/x11/cinnamon: use/x11/xorg use/x11/drm
 	@$(call add,THE_LISTS,$(call tags,cinnamon desktop))
 
+use/x11/gnome3: use/x11/xorg use/x11/drm
+	@$(call add,THE_PACKAGES,gnome3-default)
+	@$(call add,THE_PACKAGES,gst-libav pulseaudio-daemon)
+
 use/x11/e17: use/x11/xorg use/x11/3d-free
 	@$(call add,THE_LISTS,$(call tags,e17 desktop))
 
 use/x11/lxde: use/x11/xorg
 	@$(call add,THE_LISTS,$(call tags,lxde desktop))
+
+use/x11/fvwm: use/x11/xorg
+	@$(call add,THE_LISTS,$(call tags,fvwm desktop))
+
+use/x11/sugar: use/x11/xorg
+	@$(call add,THE_LISTS,$(call tags,sugar desktop))
+
+use/x11/wmaker: use/x11/xorg
+	@$(call add,THE_LISTS,$(call tags,wmaker desktop))
+
+use/x11/gnustep: use/x11/xorg
+	@$(call add,THE_LISTS,$(call tags,gnustep desktop))
+
+use/x11/xmonad: use/x11/xorg
+	@$(call add,THE_LISTS,$(call tags,xmonad desktop))

image.in/.gitignore

@@ -1 +1,3 @@
 build.log
+reports
+out

image.in/Makefile

@@ -8,7 +8,7 @@ OUT_LINK := out
 # - minimal version is bumped for critical bugfixes/features
 # - optimal one relates to the less universally relevant bits
 MKI_VER_MINIMAL = 0.1.7
-MKI_VER_OPTIMAL = 0.2.5
+MKI_VER_OPTIMAL = 0.2.6
 
 include distcfg.mk
 include functions.mk
@@ -29,8 +29,11 @@ $(info warning: mkimage-$(MKI_VERSION) is suboptimal, consider upgrading)
 $(warning consider upgrading mkimage to $(MKI_VER_OPTIMAL) or better)
 endif
 
+# glob it just in case
+IMAGEDIR := $(wildcard $(IMAGEDIR))
+
 # additional means to reduce havoc in IMAGEDIR
-IMAGE_SORTDIR := $(SORTDIR)
+IMAGE_SORTDIR := $(wildcard $(SORTDIR))
 
 # reconstruct instead of passing yet another variable
 IMAGE_OUTDIR   := $(IMAGEDIR)$(IMAGE_SORTDIR:%=/%)

lib/build.mk

@@ -42,7 +42,7 @@ IMAGEDIR ?= $(shell \
 	fi; \
 )
 
-LOGDIR ?= $(IMAGEDIR)
+LOGDIR ?= $(wildcard $(IMAGEDIR))
 
 # actual build starter
 # NB: our output MUST go into stderr to escape POSTPROC

lib/kernel.mk

@@ -1,10 +0,0 @@
-ifndef MKIMAGE_PROFILES
-$(error this makefile is designed to be included in toplevel one)
-endif
-
-# choose std kernel flavour for max RAM size support
-ifeq (i586,$(ARCH))
-BIGRAM := std-pae
-else
-BIGRAM := std-def
-endif

lib/profile.mk

@@ -57,6 +57,7 @@ profile/init: distclean
 		echo; \
 	} $(LOG); \
 	if ! grep -q "\<$(ARCH)\>" $(BUILDDIR)/sources.list; then \
+		if grep -q " noarch " $(BUILDDIR)/sources.list; then \
 			echo -n "requested arch '$$ARCH' unavailable" >&2; \
 			if [ -z "$(APTCONF)" ]; then \
 				echo " (no APTCONF)"; \
@@ -65,7 +66,8 @@ profile/init: distclean
 			fi >&2; \
 			exit 1; \
 		fi; \
-	mp-commit "$(BUILDDIR)" "derivative profile initialized"; \
+	fi; \
+	mp-commit -i "$(BUILDDIR)" "derivative profile initialized"; \
 	if [ -w . ]; then \
 		rm -f "$(SYMLINK)" && \
 		ln -s "$(BUILDDIR)" "$(SYMLINK)" && \
@@ -82,8 +84,8 @@ profile/bare: profile/init
 	} >&2
 	@$(call try,MKIMAGE_PREFIX,/usr/share/mkimage)
 	@$(call try,GLOBAL_VERBOSE,)
-	@$(call try,IMAGEDIR,$(IMAGEDIR))
+	@$(call try,IMAGEDIR,$(wildcard $(IMAGEDIR)))
-	@$(call try,LOGDIR,$(LOGDIR))
+	@$(call try,LOGDIR,$(wildcard $(LOGDIR)))
 	@$(call try,BRANDING,altlinux-sisyphus)
 ifeq (,$(REPO:altlinux%=))
 	@$(call set,IMAGE_INIT_LIST,+branding-$$(BRANDING)-release)

main.mk

@@ -34,6 +34,12 @@ include $(sort $(wildcard lib/*.mk))
 include conf.d/*.mk
 include features.in/*/config.mk
 
+# ensure the outdir is created and globbable
+ifdef IMAGEDIR
+$(shell mkdir -p $(IMAGEDIR))
+IMAGEDIR := $(wildcard $(IMAGEDIR))
+endif
+
 # FIXME: this is buggy since *.mk can expose parts conditionally
 #        (e.g. test.mk does DEBUG-only bits) and these will fail
 DISTRO_TARGETS := $(shell sed -n 's,^\(distro/[^:.]\+\):.*$$,\1,p' \

pkg.in/lists/domain-client

@@ -0,0 +1,24 @@
+pam_mount
+
+samba4-client
+cifs-utils
+keyutils
+nfs-clients
+autofs
+installer-feature-auto-domain
+installer-feature-nfs-client-stage3
+installer-feature-start-avahi
+installer-feature-network-shares-client-stage3
+installer-feature-weak-passwd
+libnss-fallback
+libnss-mdns
+
+settime-rfc867
+
+krb5-ticket-watcher
+
+alterator-browser-qt
+alterator-standalone
+
+alterator-auth
+alterator-net-shares

pkg.in/lists/homeros/homeros

@@ -0,0 +1,2 @@
+homeros-core
+homeros-live-data

pkg.in/lists/homeros/tools

@@ -0,0 +1,6 @@
+su
+sudo
+net-tools
+openssh-server
+amixer
+alsa-utils

pkg.in/lists/homeros/tts

@@ -0,0 +1,2 @@
+RHVoice
+espeak

pkg.in/lists/homeros/voiceman

@@ -0,0 +1,3 @@
+voiceman-server
+voiceman
+voiceman-tools

pkg.in/lists/homeros/yasr

@@ -0,0 +1 @@
+yasr

pkg.in/lists/ltsp

@@ -2,8 +2,8 @@ ltsp-server
 ltsp-server-basic
 openssh-server
 
-#alterator-ltsconf
+alterator-ltsconf
-#alterator-standalone
+alterator-standalone
 
 alsa-plugins
 alsa-plugins-pulse

pkg.in/lists/ltsp-client

@@ -3,3 +3,7 @@ ltsp-client-full
 ltsp-client-nxsession
 # ouch!
 mc
+
+kernel-image-led-ws
+kernel-modules-drm-led-ws
+kernel-modules-alsa-led-ws

pkg.in/lists/ltsp-client.i586

@@ -1,3 +0,0 @@
-kernel-image-ltsp-client
-kernel-modules-drm-ltsp-client
-kernel-modules-alsa-ltsp-client

pkg.in/lists/ltsp-client.x86_64

@@ -1,3 +0,0 @@
-kernel-image-std-def
-kernel-modules-drm-std-def
-kernel-modules-alsa-std-def

pkg.in/lists/tagged/base+efi

@@ -1,5 +1,6 @@
 gdisk
 parted
+fatresize
 dosfstools
 grub2-efi
 elilo

pkg.in/lists/tagged/base+live

@@ -1,5 +1,6 @@
 wget
 rsync
 apt
+fdisk
 vim-console
 mc

pkg.in/lists/tagged/base+regular

@@ -0,0 +1,20 @@
+openssh
+net-tools
+
+strace
+powertop
+acpi
+
+apt-repo
+update-kernel
+synaptic-usermode
+eepm
+
+alterator-standalone
+cpufreq-simple
+xdg-user-dirs
+eject
+
+firefox-ru
+firefox-uk
+firefox-kk

pkg.in/lists/tagged/base+rescue

@@ -18,3 +18,6 @@ man-pages
 sysfsutils
 sysklogd
 util-linux
+
+# Package management
+apt-repo

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

@@ -1,3 +1,2 @@
-gnome3-default
+cinnamon-regular
-libreoffice libreoffice-gnome libreoffice-langpack-ru
 gimp

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

@@ -1,3 +1,7 @@
 gst-plugins-*
 gst-ffmpeg
 gnome-mplayer
+
+econnman
+
+e17-extra-modules

pkg.in/lists/tagged/desktop+fvwm

@@ -0,0 +1,6 @@
+fvwm
+fvwm-doc
+fvwm-icons
+fvwm-themes
+fvwm-crystal
+xterm

pkg.in/lists/tagged/desktop+gnustep

@@ -0,0 +1,68 @@
+
+gnustep-back
+gnustep-base
+gnustep-charsets
+gnustep-dbuskit
+gnustep-dirs
+gnustep-easydiff
+gnustep-gmastermind
+gnustep-gmines
+gnustep-gorm
+gnustep-gshisen
+gnustep-gui
+gnustep-gworkspace
+gnustep-make
+gnustep-mknfonts
+gnustep-pdfkit
+gnustep-projectcenter
+gnustep-renaissance
+gnustep-simplewebkit
+gnustep-sqlclient
+gnustep-steptalk
+gnustep-sudoku
+gnustep-systempreferences
+gnustep-themes-Gtk
+gnustep-ucsdata
+gnustep-xcode
+libgnustep-objc2
+
+gnustep-AddressManager
+gnustep-CDPlayer
+gnustep-FTP
+gnustep-FisicaLab
+gnustep-GNUMail
+gnustep-GSPdf
+gnustep-Gemas
+gnustep-Graphos
+gnustep-HighlighterKit
+gnustep-IMImage
+gnustep-LaternaMagica
+gnustep-NoteBook
+gnustep-PRICE
+gnustep-Pantomime
+gnustep-RpmViewer
+gnustep-SimpleAgenda
+gnustep-TextEdit
+gnustep-Zipper
+gnustep-themes-Neos
+gnustep-themes-Nesedah
+gnustep-themes-Narcissus
+gnustep-silver.theme
+gnustep-cddb.bundle
+
+gnustep-Ghack
+gnustep-RSSkit
+gnustep-Grr
+#gnustep-IconManager
+gnustep-LapisPuzzle
+gnustep-MPDCon
+gnustep-TimeMon
+##gnustep-PictureFrame	is not even alpha quality yet
+
+gnustep-SGContentViewer
+gnustep-Preview
+
+gnustep-terminal
+
+# a text editor
+leafpad

pkg.in/lists/tagged/desktop+live

@@ -3,4 +3,6 @@ xinit
 xinitrc
 livecd-setlocale
 installer-feature-runlevel5-stage3
+os-prober
+sudo
 su

pkg.in/lists/tagged/desktop+lxde

@@ -1,6 +1,7 @@
 openbox
 
 pcmanfm2
+eject
 
 lxde-common
 lxde-lxpanel
@@ -11,12 +12,14 @@ lxde-lxtask
 lxde-lxshortcut
 lxde-lxappearance
 lxde-lxappearance-obconf
+lxde-lxshortcut
+lxde-lxinput
 
 menu-cache
 altlinux-freedesktop-menu-lxde
 
-# lxterminal is reportedly sub-par
+# NB: an lxde-settings is required by lxde-common
-#lxde-lxterminal
+lxde-settings-upstream
-sakura
 
+lxde-icon-theme
 tango-icon-theme

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

@@ -1,5 +1,9 @@
 tango-icon-theme-extras
 
+lxde-lxterminal
+sakura
+fonts-bitmap-terminus
+
 leafpad
 galculator
 deadbeef
@@ -9,5 +13,14 @@ parcellite
 # gqview has thumbnails support, gpicview doesn't
 gqview
 
-# file-roller is recommended over xarchiver and not that fatty yet
+# file-roller is recommended over xarchiver (gns@) and not that fatty yet
 file-roller
+
+# for pcmanfm2 (aen@)
+gvfs
+gvfs-backends
+gvfs-utils
+fuse-gvfs
+
+# openbox behaviour, virtual desktops, etc
+obconf

pkg.in/lists/tagged/desktop+mate

@@ -1,47 +1,6 @@
+mate-full
+
 altlinux-freedesktop-menu-mate
-mate-conf-gtk
-mate-control-center
-mate-desktop
-mate-dialogs
-mate-file-manager
-mate-icon-theme
-mate-keyring
-mate-menus
-mate-mime-data
-mate-notification-daemon
-mate-panel
-mate-polkit
-mate-session
-#mate-session-manager
-mate-settings-daemon
-mate-themes
-mate-vfs gvfs-backends
-mate-vfs-smb
-mate-window-manager
-
-mate-applets
-mate-bluetooth
-mate-calc
-mate-charmap
-mate-document-viewer
-mate-document-viewer-caja
-mate-document-viewer-djvu
-mate-file-archiver
-mate-image-viewer
-mate-media
-mate-media-apps
-mate-netspeed
-mate-power-manager
-mate-screensaver
-mate-terminal
-mate-utils
-#mate-utils-mate-system-log
-
-mate-file-manager-extensions
-mate-file-manager-image-converter
-mate-file-manager-open-terminal
-mate-file-manager-sendto
-parcellite
 
 ### should be dropped at some stage; see bugreports within this thread:
 # http://lists.altlinux.org/pipermail/sisyphus/2012-August/358079.html

pkg.in/lists/tagged/desktop+razorqt

@@ -1,5 +1,5 @@
 razorqt
-arora
+qupzilla
 qtfm
 qterminal
 juffed

pkg.in/lists/tagged/desktop+regular

@@ -9,7 +9,7 @@ alterator-auth
 alterator-nsswitch
 
 alterator-net-general
-alterator-net-pppoe
+alterator-net-pppoe rp-pppoe-client
 alterator-net-pptp
 alterator-net-openvpn
 alterator-net-eth
@@ -18,6 +18,9 @@ alterator-net-wifi
 alterator-net-shares
 alterator-proxy
 
+alterator-x11
+alterator-xkb
+
 #alterator-datetime
 
-system-config-printer
+#system-config-printer

pkg.in/lists/tagged/desktop+sugar

@@ -0,0 +1,56 @@
+sugar
+sugar-abacus
+sugar-analyze
+sugar-calculator
+sugar-calendario
+sugar-chat
+sugar-clock
+sugar-connect
+sugar-countries
+sugar-cp-all
+sugar-cp-datetime
+sugar-cp-frame
+sugar-cp-keyboard
+sugar-cp-language
+sugar-cp-modemconfiguration
+sugar-cp-network
+sugar-cp-power
+sugar-cp-updater
+sugar-distance
+sugar-emulator
+sugar-finance
+sugar-flip
+sugar-getiabooks
+sugar-help
+sugar-imageviewer
+sugar-infoslicer
+sugar-log
+sugar-logos
+sugar-measure
+sugar-memorize
+sugar-moon
+sugar-nutrition
+sugar-playgo
+sugar-portfolio
+sugar-presence-service
+sugar-pukllanapac
+sugar-recall
+sugar-record
+sugar-ruler
+sugar-speak
+sugar-stopwatch
+sugar-terminal
+sugar-turtleart
+sugar-typing-turtle
+sugar-view-slides
+sugar-visualmatch
+sugar-write
+sugar-xoirc
+sugar-xomail
+sugar-base
+sugar-datastore
+sugar-paint
+sugar-settings-manager
+sugar-toolkit
+sugar-toolkit-gtk3
+metacity-gnome

pkg.in/lists/tagged/desktop+wmaker

@@ -0,0 +1,10 @@
+WindowMaker
+
+wmsystemtray
+wmdf
+wmnd
+wmsm
+wmacpi
+wmfire
+wmclock
+wmaker-theme-club07

pkg.in/lists/tagged/desktop+xmonad

@@ -0,0 +1,7 @@
+xmonad
+xmonad-contrib
+xmonad-utils
+xinit
+rxvt-unicode
+libXinerama-devel
+libXext-devel

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

@@ -0,0 +1 @@
+^ghc.*-darcs

pkg.in/lists/tagged/live+builder

@@ -1,3 +1,2 @@
 livecd-tmpfs
-livecd-online-repo
 mkimage-profiles

pkg.in/lists/tagged/mobile+mate

@@ -1,6 +1,6 @@
 NetworkManager
 NetworkManager-gnome
-wpa_gui
+NetworkManager-l2tp-gnome
 rfkill
 dbus-tools-gui
 fonts-ttf-droid

pkg.in/lists/tagged/regular+icewm

@@ -0,0 +1,18 @@
+sysklogd
+SysVinit-usermode
+
+deepsolver
+deepsolver-repo
+
+xxkb
+mutt
+elinks
+
+tray_mixer_plus
+leafpad
+
+gqview
+screengrab
+design-icewm-themes
+
+rp-pppoe-gui

pkg.in/lists/tagged/regular+kde4

@@ -0,0 +1,15 @@
+kde4-regular
+
+plasma-applet-networkmanager
+
+pulseaudio-daemon
+alsa-plugins-pulse
+phonon-gstreamer
+pavucontrol
+
+synaptic-kde
+synaptic-usermode-
+gtk2-theme-oxygen-gtk
+gtk3-theme-oxygen-gtk
+altlinux-freedesktop-menu-kde4
+altlinux-freedesktop-menu-shallow-menu

pkg.in/lists/tagged/rescue+extra

@@ -21,6 +21,7 @@ lvm2
 mdadm
 ms-sys
 parted
+partclone
 sdparm
 sfdisk
 smartmontools
@@ -52,24 +53,47 @@ findutils
 file
 less
 
-# Filesystem utils
+# Filesystem maintenance
-dosfstools
+btrfs-progs
 e2fsprogs
+f2fs-tools
 jfsprogs
-ntfs-3g
+logfsprogs
-recover
+nilfs-utils
-recoverdm
+reiser4progs
 reiserfsprogs
 xfsprogs
-btrfs-progs
+
+# Compressed filesystem image
+clicfs-utils
+cloop-utils
+squashfsprogs
+squashfsprogs3
+squashfsprogs-xz
+
+# Foreign filesystems
+dosfstools
+exofs-utils
+fatresize
+fuse-zfs
+hfsprogs
+ntfs-3g
+ocfs2-tools
+
+# Filesystem recovery/cleanup
 ext3grep
-dmsdos
 extundelete
+foremost
+magicrescue
+recover
+recoverdm
 scalpel
+sleuthkit
 testdisk
 testdisk-doc
-zerofree
 wipefreespace
+xfsdump
+zerofree
 
 # Applications/Networking
 arpwatch
@@ -87,6 +111,7 @@ mtr
 netcat
 netlist
 nfs-utils
+cifs-utils
 ngrep
 nmap
 p0f

pkg.in/lists/tagged/rescue+fs

@@ -1,8 +1,5 @@
 #anyfs-tools
 cpipe
+pv
 dar
-ddrescue
+dmsdos
-foremost
-sleuthkit
-xfsdump
-#zfs-fuse