0.9.14-alt1

- more regular fixes
regular.mk: re-enabled plymouth for regular-gnome3.iso
2013-05-20 13:10:49 +03:00 · 2013-05-14 21:55:07 +04:00 · 2013-05-14 21:21:35 +04:00 · 2013-05-14 19:33:38 +04:00 · 2013-05-14 18:22:04 +03:00 · 2013-05-13 23:09:39 +03:00
63 changed files with 590 additions and 175 deletions
--- a/.gear/mkimage-profiles.spec
+++ b/.gear/mkimage-profiles.spec
@@ -1,5 +1,5 @@
 Name: mkimage-profiles
-Version: 0.9.8.1
+Version: 0.9.14
 Release: alt1

 Summary: ALT Linux based distribution metaprofile
@@ -78,6 +78,24 @@ cp -a * %buildroot%mpdir
 %doc %docs/*

 %changelog
+* Mon May 20 2013 Michael Shigorin <mike@altlinux.org> 0.9.14-alt1
+- more regular fixes
+
+* Mon May 13 2013 Michael Shigorin <mike@altlinux.org> 0.9.13-alt1
+- regular fixes
+
+* Mon Apr 22 2013 Michael Shigorin <mike@altlinux.org> 0.9.12-alt1
+- four weeks later...
+
+* 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)

--- a/.gear/tags/1c9a213ce4260afc13497b81c5a192224be58361
+++ b/.gear/tags/1c9a213ce4260afc13497b81c5a192224be58361
@@ -0,0 +1,6 @@
+object 4b642fe5384d3b9a0c7f318fd373b027ba902e4c
+type commit
+tag v0.9.13
+tagger Michael Shigorin <mike@altlinux.org> 1368475772 +0300
+
+regular fixes
--- a/.gear/tags/9f5450c9dc242a2ea3e07973a06f6c8821ed4672
+++ b/.gear/tags/9f5450c9dc242a2ea3e07973a06f6c8821ed4672
@@ -1,6 +0,0 @@
-object 867b2f65c9b571ab54a4bc7e158bcaaa3d80756b
-type commit
-tag v0.9.8
-tagger Michael Shigorin <mike@altlinux.org> 1361217242 +0200
-
-live fixes
--- a/.gear/tags/list
+++ b/.gear/tags/list
@@ -1 +1 @@
-9f5450c9dc242a2ea3e07973a06f6c8821ed4672 v0.9.8
+1c9a213ce4260afc13497b81c5a192224be58361 v0.9.13
--- a/12
+++ b/12
@@ -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
--- a/bin/tar2vm
+++ b/bin/tar2vm
@@ -35,6 +35,7 @@ DISKSIZE="${3:-${DEFSIZE:-268435456}}"
 DISKSIZEM="$(($DISKSIZE / 1048576))"

 # tested to work: ext[234], jfs
+# NB: xfs doesn't have a spare sector for the bootloader
 ROOTFSTYPE="${4:-ext4}"

 # single root partition hardwired so far,
--- a/conf.d/desktop.mk
+++ b/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
-	@$(call set,KFLAVOURS,led-ws)
-
 distro/kde4-lite: distro/.desktop-mini distro/.desktop-network distro/.desktop-extra +kde4-lite
 	@$(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; @:
--- a/conf.d/live.mk
+++ b/conf.d/live.mk
@@ -2,17 +2,20 @@
 ifeq (distro,$(IMAGE_CLASS))

 distro/dos: distro/.init use/dos use/syslinux/ui/menu; @:
-distro/rescue: distro/.base use/rescue use/efi/signed 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/live/install use/live/net-eth \
+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 +power \
-	use/syslinux/timeout/1 use/cleanup use/efi/signed use/live/net-eth
+	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')

@@ -25,7 +28,8 @@ 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)

@@ -42,20 +46,25 @@ distro/live-rescue: distro/live-icewm use/efi
 	@$(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-firefox)
+	@$(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)
@@ -80,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
--- a/conf.d/regular.mk
+++ b/conf.d/regular.mk
@@ -1,49 +1,77 @@
 # regular build/usage images
 ifeq (distro,$(IMAGE_CLASS))

-# TODO: use/plymouth/live when luks+plymouth is done, see also #28255
-distro/.regular-desktop: distro/.base +live +wireless use/live/ru \
-	use/live/install use/live/repo use/live/net-eth use/x11/3d-free \
-	use/systemd use/firmware/wireless use/efi/signed use/luks \
-	+vmguest use/memtest use/branding use/syslinux/ui/gfxboot
-	@$(call add,LIVE_LISTS,$(call tags,base regular))
-	@$(call add,LIVE_LISTS,$(call tags,rescue extra))
-	@$(call add,LIVE_LISTS,domain-client)
-	@$(call add,THE_BRANDING,indexhtml notes alterator bootloader)
-	@$(call set,KFLAVOURS,std-def)
-	@$(call add,KMODULES,r8168)
+# common ground
+distro/.regular-bare: distro/.base +wireless use/efi/signed use/luks \
+	use/memtest use/stage2/net-eth use/kernel/net
 	@$(call try,SAVE_PROFILE,yes)

-distro/.regular-gtk: distro/.regular-desktop use/x11/lightdm/gtk +plymouth; @:
+# 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,base rescue))
+	@$(call add,THE_BRANDING,indexhtml notes alterator)
 	@$(call add,THE_BRANDING,graphics)

-distro/regular-icewm: distro/.regular-gtk +icewm use/efi/refind
-	@$(call add,LIVE_PACKAGES,xxkb mutt)
+# 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-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
-	@$(call add,LIVE_PACKAGES,xterm xorg-xnest)
+	@$(call add,LIVE_PACKAGES,xterm)

-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
-	@$(call add,LIVE_PACKAGES,fontconfig-infinality)

-distro/regular-gnome3: distro/.regular-desktop use/x11/gnome3; @:
+distro/regular-gnome3: distro/.regular-desktop use/x11/gnome3 +plymouth; @:

 distro/regular-tde: distro/.regular-desktop +tde +plymouth
 	@$(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 +plymouth
-	@$(call add,LIVE_PACKAGES,kde4-regular)
-	@$(call add,LIVE_PACKAGES,plasma-applet-networkmanager)
+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 use/x11/razorqt use/x11/kdm4 \
-	+plymouth; @:
+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
--- a/conf.d/server.mk
+++ b/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 \
-	use/cleanup/x11-alterator use/efi
+distro/server-mini: distro/.server-base use/server/mini use/kernel/net \
+	use/cleanup/x11-alterator use/efi use/stage2/net-eth
 	@$(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 xtables-addons)
+	@$(call add,MAIN_KMODULES,ipset ipt-netflow opendpi pf_ring)
+	@$(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)
--- a/conf.d/test.mk
+++ b/conf.d/test.mk
@@ -22,6 +22,10 @@ distro/live-gns3: distro/live-icewm
 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)

--- a/doc/params.txt
+++ b/doc/params.txt
@@ -61,7 +61,7 @@
 ** см. ../features.in/live/generate.mk (тж. по умолчаниям)

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

--- a/features.in/efi/config.mk
+++ b/features.in/efi/config.mk
@@ -18,6 +18,7 @@ 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
@@ -25,7 +26,7 @@ use/efi/signed: use/efi
 	@$(call add,RESCUE_PACKAGES,openssl sbsigntools)

 use/efi/shell: use/efi
-	@$(call set,EFI_SHELL,efi-shell)
+	@$(call try,EFI_SHELL,efi-shell)

 use/efi/debug: use/efi
 	@$(call add,STAGE2_PACKAGES,efibootmgr gdisk)
--- a/features.in/firmware/config.mk
+++ b/features.in/firmware/config.mk
@@ -5,6 +5,10 @@
 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)

@@ -19,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)
--- a/features.in/fonts/config.mk
+++ b/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)
--- a/features.in/fonts/stage2/image-scripts.d/50-fontconfig
+++ b/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
+
+:
--- a/features.in/isohybrid/README
+++ b/features.in/isohybrid/README
@@ -1,6 +1,6 @@
-Эта фича производит постобработку ISO-образа утилитой isohybrid
-с целью обеспечения возможности его загрузки как с CD/DVD,
-так и с USB-флэшки.
+Эта фича обеспечивает формирование ISO-образа с добавлением липовой
+таблицы разделов с целью обеспечения возможности его загрузки
+как с CD/DVD, так и с USB-флэшки.

 Можно указать в цепочке зависимостей дистрибутива явно с тем,
 чтобы гарантировать гибридный вид образа, либо запросить включение
@@ -8,5 +8,5 @@
 (ISOHYBRID=1, см. ../pack/config.mk).

 Обратите внимание: в propagator до 20101130-alt15 поддержка
-автоматической загрузки с флэш-носителя и при этом ISO-образа
+автоматической загрузки с флэш-носителя, содержащего ISO-образ,
 отсутствует, что компенсируется специальной обработкой в gfxboot.
--- a/features.in/isohybrid/config.mk
+++ b/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)
--- a/features.in/isohybrid/lib/80-isohybrid.mk
+++ b/features.in/isohybrid/lib/80-isohybrid.mk
@@ -1,4 +0,0 @@
-CHROOT_PACKAGES += syslinux
-
-postprocess-80isohybrid:
-	@isohybrid "$(IMAGEDIR)/$(IMAGE_OUTFILE)"
--- a/features.in/kernel/README
+++ b/features.in/kernel/README
@@ -1,2 +1,7 @@
 Эта фича привносит код, имеющий смысл при добавлении в образ ядра,
 и задаёт начальный вариант такового.
+
+Также занимается складированием наборов имён пакетов kernel-modules-*
+с тем, чтобы избавить релиз-менеджеров от необходимости учитывать
+полные списки и точные имена дополнительных модулей для поддержки,
+скажем, Ethernet.
--- a/features.in/kernel/config.mk
+++ b/features.in/kernel/config.mk
@@ -8,3 +8,6 @@ endif
 use/kernel:
 	@$(call add_feature)
 	@$(call set,KFLAVOURS,std-def)
+
+use/kernel/net:
+	@$(call add,THE_KMODULES,e1000e igb r8168 rtl8168)
--- a/features.in/live/config.mk
+++ b/features.in/live/config.mk
@@ -9,6 +9,14 @@ 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)
@@ -23,9 +31,14 @@ use/live/desktop: use/live/base use/x11/wacom use/live/sound \
 	@$(call add,SYSLINUX_CFG,localboot)

 # preconfigure apt for both live and installed-from-live systems
-use/live/repo:
-	@$(call add,LIVE_PACKAGES,livecd-online-repo)
+use/live/repo: use/live
 	@$(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
@@ -53,8 +66,3 @@ use/live/ru: use/live

 use/live/sound: use/live
 	@$(call add,LIVE_PACKAGES,amixer alsa-utils aplay udev-alsa)
-
-# eth0 instead of enp0s3
-use/live/net-eth: use/live
-	@$(call add,STAGE1_PACKAGES,udev-rule-generator-net)
-	@$(call add,STAGE2_PACKAGES,udev-rule-generator-net livecd-net-eth)
--- a/features.in/live/live/image-scripts.d/03-services
+++ b/features.in/live/live/image-scripts.d/03-services
@@ -22,7 +22,6 @@ switch() {

 ENABLE="
 dm
-gdm
 kdm
 wdm
 prefdm
@@ -34,6 +33,7 @@ livecd-save-nfs
 livecd-setauth
 livecd-setlocale
 livecd-net-eth
+livecd-install-wmaker
 network
 NetworkManager
 connman
@@ -41,24 +41,32 @@ random
 rpcbind
 plymouth
 avahi-daemon
+cpufreq-simple
 "

 # NB: dnsmasq: https://bugzilla.altlinux.org/show_bug.cgi?id=18799
 # NB: sshd might be needed for some particular cases
 DISABLE="
 anacron
+blk-availability
 bridge
 clamd
 crond
 dhcpd
 dnsmasq
+lvm2-lvmetad
+lvm2-monitor
 mdadm
 netfs
+o2cb
+ocfs2
 openvpn
+postfix
 rawdevices
 slapd
 smartd
 sshd
+sysstat
 update_wms
 xinetd
 "
--- a/features.in/live/live/image-scripts.d/60-apt
+++ b/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"
--- a/features.in/ltsp/config.mk
+++ b/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
--- a/features.in/rescue/README
+++ b/features.in/rescue/README
@@ -1,3 +1,9 @@
 Эта фича дополняет базовый "живой" образ второй стадии
 специфическими для спасательного образа настройками
 и скриптовыми хуками.
+
+Цель use/rescue/rw добавляет предварительно настроенный
+пункт загрузки, который в случае "просто гибридного"
+(не GPT) ISO, записанного на USB Flash, обеспечит создание
+и монтирование дополнительного раздела для сохранения данных
+между сессиями.
--- a/features.in/rescue/config.mk
+++ b/features.in/rescue/config.mk
@@ -1,5 +1,16 @@
 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_PACKAGES,interactivesystem sysvinit udev)
+	@$(call add,RESCUE_PACKAGES,startup startup-rescue lilo)
 	@$(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
--- a/features.in/slinux/config.mk
+++ b/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/firmware/wireless use/branding/complete \
-	use/x11/drm use/x11/3d-proprietary
+use/slinux/full: use/isohybrid use/slinux use/systemd +wireless \
+	use/branding/complete use/x11/drm use/x11/3d-proprietary
 	@$(call add,THE_PACKAGES,apt-conf-sisyphus)
--- a/features.in/stage2/config.mk
+++ b/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)
--- a/features.in/syslinux/cfg.in/32live_rw.cfg
+++ b/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@
+
--- a/features.in/syslinux/cfg.in/82rescue_rw.cfg
+++ b/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
+
+
--- a/features.in/vmguest/config.mk
+++ b/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:
-	@$(call add_feature)
+use/vmguest/kvm: use/vmguest
 	@$(call add,THE_PACKAGES,spice-vdagent)

 # see also use/install2/kvm
--- a/features.in/wireless/config.mk
+++ b/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 crda iw)
+
+use/wireless/full: use/wireless use/firmware/wireless; @:
--- a/features.in/x11/config.mk
+++ b/features.in/x11/config.mk
@@ -1,5 +1,6 @@
 +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; @:
 +kde4-lite: use/x11/kde4-lite use/x11/kdm4; @:

@@ -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
@@ -66,6 +68,7 @@ use/x11/cinnamon: use/x11/xorg use/x11/drm

 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))
@@ -75,3 +78,15 @@ use/x11/lxde: use/x11/xorg

 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))
--- a/lib/profile.mk
+++ b/lib/profile.mk
@@ -57,13 +57,15 @@ profile/init: distclean
 		echo; \
 	} $(LOG); \
 	if ! grep -q "\<$(ARCH)\>" $(BUILDDIR)/sources.list; then \
-		echo -n "requested arch '$$ARCH' unavailable" >&2; \
-		if [ -z "$(APTCONF)" ]; then \
-			echo " (no APTCONF)"; \
-		else \
-			echo; \
-		fi >&2; \
-		exit 1; \
+		if grep -q " noarch " $(BUILDDIR)/sources.list; then \
+			echo -n "requested arch '$$ARCH' unavailable" >&2; \
+			if [ -z "$(APTCONF)" ]; then \
+				echo " (no APTCONF)"; \
+			else \
+				echo; \
+			fi >&2; \
+			exit 1; \
+		fi; \
 	fi; \
 	mp-commit -i "$(BUILDDIR)" "derivative profile initialized"; \
 	if [ -w . ]; then \
--- a/pkg.in/lists/domain-client
+++ b/pkg.in/lists/domain-client
@@ -13,6 +13,8 @@ installer-feature-weak-passwd
 libnss-fallback
 libnss-mdns

+settime-rfc867
+
 krb5-ticket-watcher

 alterator-browser-qt
@@ -20,4 +22,3 @@ alterator-standalone

 alterator-auth
 alterator-net-shares
-
--- a/pkg.in/lists/ltsp
+++ b/pkg.in/lists/ltsp
@@ -2,8 +2,8 @@ ltsp-server
 ltsp-server-basic
 openssh-server

-#alterator-ltsconf
-#alterator-standalone
+alterator-ltsconf
+alterator-standalone

 alsa-plugins
 alsa-plugins-pulse
--- a/pkg.in/lists/ltsp-client
+++ b/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
--- a/pkg.in/lists/ltsp-client.i586
+++ b/pkg.in/lists/ltsp-client.i586
@@ -1,3 +0,0 @@
-kernel-image-ltsp-client
-kernel-modules-drm-ltsp-client
-kernel-modules-alsa-ltsp-client
--- a/pkg.in/lists/ltsp-client.x86_64
+++ b/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
--- a/pkg.in/lists/tagged/base+live
+++ b/pkg.in/lists/tagged/base+live
@@ -1,5 +1,6 @@
 wget
 rsync
 apt
+fdisk
 vim-console
 mc
--- a/pkg.in/lists/tagged/base+regular
+++ b/pkg.in/lists/tagged/base+regular
@@ -1,3 +1,9 @@
+lvm2
+make-initrd-lvm
+
+mdadm
+make-initrd-mdadm
+
 openssh
 net-tools

@@ -5,15 +11,17 @@ strace
 powertop
 acpi

-livecd-online-repo
 apt-repo
 update-kernel
 synaptic-usermode
 eepm

+bash-completion
 alterator-standalone
 cpufreq-simple
 xdg-user-dirs
-firefox-ru
-uvcview
 eject
+
+firefox-ru
+firefox-uk
+firefox-kk
--- a/pkg.in/lists/tagged/base+rescue
+++ b/pkg.in/lists/tagged/base+rescue
@@ -1,20 +1,16 @@
 # Startup
 rootfiles
-sysvinit
-interactivesystem
-startup
-startup-rescue
-
-udev

 # Common
 coreutils
 glibc-locales
 glibc-nss
 glibc-utils
-lilo
 man
 man-pages
 sysfsutils
 sysklogd
 util-linux
+
+# Package management
+apt-repo
--- a/pkg.in/lists/tagged/desktop+gnustep
+++ b/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
--- a/pkg.in/lists/tagged/desktop+lxde
+++ b/pkg.in/lists/tagged/desktop+lxde
@@ -13,11 +13,13 @@ lxde-lxshortcut
 lxde-lxappearance
 lxde-lxappearance-obconf
 lxde-lxshortcut
+lxde-lxinput

 menu-cache
 altlinux-freedesktop-menu-lxde

 # NB: an lxde-settings is required by lxde-common
-lxde-settings-altlinux
+lxde-settings-upstream

+lxde-icon-theme
 tango-icon-theme
--- a/pkg.in/lists/tagged/desktop+lxde+extra
+++ b/pkg.in/lists/tagged/desktop+lxde+extra
@@ -1,6 +1,6 @@
 tango-icon-theme-extras

-#lxde-lxterminal
+lxde-lxterminal
 sakura
 fonts-bitmap-terminus

--- a/pkg.in/lists/tagged/desktop+mate
+++ b/pkg.in/lists/tagged/desktop+mate
@@ -1,49 +1,6 @@
-mate-default
+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
--- a/pkg.in/lists/tagged/desktop+razorqt
+++ b/pkg.in/lists/tagged/desktop+razorqt
@@ -1,5 +1,5 @@
 razorqt
-arora
+qupzilla
 qtfm
 qterminal
 juffed
--- a/pkg.in/lists/tagged/desktop+regular
+++ b/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
--- a/pkg.in/lists/tagged/desktop+sugar
+++ b/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
--- a/pkg.in/lists/tagged/desktop+tde
+++ b/pkg.in/lists/tagged/desktop+tde
@@ -19,3 +19,6 @@ kdeaddons-konqueror
 #digikam-image-plugins
 kaffeine
 kdemultimedia-kmix
+
+# rom_as@ says it's still needed
+hal
--- a/pkg.in/lists/tagged/desktop+wmaker
+++ b/pkg.in/lists/tagged/desktop+wmaker
@@ -0,0 +1,10 @@
+WindowMaker
+
+wmsystemtray
+wmdf
+wmnd
+wmsm
+wmacpi
+wmfire
+wmclock
+wmaker-theme-club07
--- a/pkg.in/lists/tagged/desktop+xmonad
+++ b/pkg.in/lists/tagged/desktop+xmonad
@@ -0,0 +1,7 @@
+xmonad
+xmonad-contrib
+xmonad-utils
+xinit
+rxvt-unicode
+libXinerama-devel
+libXext-devel
--- a/pkg.in/lists/tagged/desktop+xmonad+extra
+++ b/pkg.in/lists/tagged/desktop+xmonad+extra
@@ -0,0 +1 @@
+^ghc.*-darcs
--- a/pkg.in/lists/tagged/live+builder
+++ b/pkg.in/lists/tagged/live+builder
@@ -1,3 +1,2 @@
 livecd-tmpfs
-livecd-online-repo
 mkimage-profiles
--- a/pkg.in/lists/tagged/regular+icewm
+++ b/pkg.in/lists/tagged/regular+icewm
@@ -0,0 +1,20 @@
+sysklogd
+SysVinit-usermode
+
+deepsolver
+deepsolver-repo
+
+xxkb
+icewm-startup-xxkb-tray
+mutt
+elinks
+
+tray_mixer_plus
+icewm-startup-tray_mixer_plus
+leafpad
+
+gqview
+screengrab
+design-icewm-themes
+
+rp-pppoe-gui
--- a/pkg.in/lists/tagged/regular+kde4
+++ b/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
--- a/pkg.in/lists/tagged/rescue+extra
+++ b/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
-dosfstools
+# Filesystem maintenance
+btrfs-progs
 e2fsprogs
+f2fs-tools
 jfsprogs
-ntfs-3g
-recover
-recoverdm
+logfsprogs
+nilfs-utils
+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
--- a/pkg.in/lists/tagged/rescue+fs
+++ b/pkg.in/lists/tagged/rescue+fs
@@ -1,8 +1,5 @@
 #anyfs-tools
 cpipe
+pv
 dar
-ddrescue
-foremost
-sleuthkit
-xfsdump
-#zfs-fuse
+dmsdos
--- a/pkg.in/lists/tagged/rescue+misc
+++ b/pkg.in/lists/tagged/rescue+misc
@@ -0,0 +1,34 @@
+# BDB
+db4.8-utils
+
+# Networking
+drbd83-tools
+iscsitarget-utils
+ntp-utils
+
+# Optical media
+dvd+rw-tools
+readom
+xorriso
+
+# Magnetic tapes
+dvgrab
+mt-st
+mtx
+
+# Hardware
+irda-utils
+lm_sensors3
+lshw
+smbios-utils
+
+# Misc^2
+kexec-tools
+multipath-tools
+
+# initrd helpers
+make-initrd-devmapper
+make-initrd-mdadm
+make-initrd-lvm
+make-initrd-multipath
+make-initrd-nfs
--- a/pkg.in/lists/tagged/security+extra
+++ b/pkg.in/lists/tagged/security+extra
@@ -7,3 +7,6 @@ md5deep
 osec
 osec-cronjob
 osec-mailreport
+
+# hardware reliability
+mcelog
--- a/pkg.in/lists/xorg
+++ b/pkg.in/lists/xorg
@@ -10,13 +10,12 @@ xorg-drv-modesetting
 xorg-drv-multimedia
 xorg-drv-nouveau
 xorg-drv-nv
-xorg-drv-s3
+#xorg-drv-s3
 xorg-drv-s3virge
 xorg-drv-savage
 xorg-drv-sis
 xorg-drv-synaptics
 xorg-drv-vesa
-xorg-drv-video
 xorg-drv-void
 xorg-drv-qxl

@@ -24,6 +23,7 @@ xorg-drv-qxl
 xorg-dri-intel

 xauth
+
 xorg-utils

 x-cursor-theme-jimmac
--- a/sub.in/stage1/modules
+++ b/sub.in/stage1/modules
@@ -87,6 +87,7 @@ eth16i.ko
 ewrk3.ko
 ext2
 ext3.ko
+ext4.ko
 fat.ko
 fdomain_cs.ko
 fdomain.ko
@@ -168,7 +169,7 @@ qlogicfas408.ko
 qlogicfas.ko
 qlogicfc.ko
 qlogicisp.ko
-r8169.ko
+r8168.ko
 raid_class.ko
 reiserfs.ko
 rrunner.ko