0.9.10-alt1

- fonts: axios!

.gear/mkimage-profiles.spec

@@ -1,5 +1,5 @@
 Name: mkimage-profiles
-Version: 0.9.6
+Version: 0.9.10
 Release: alt1
 
 Summary: ALT Linux based distribution metaprofile
@@ -78,6 +78,21 @@ cp -a * %buildroot%mpdir
 %doc %docs/*
 
 %changelog
+* 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
 

.gear/tags/432f34bfd2a6ee1047c2c7263bca2038fe14f3e7

@@ -0,0 +1,6 @@
+object 6605eb61bdecf70b2de7ca5cf96d0b1fa341aab6
+type commit
+tag v0.9.9
+tagger Michael Shigorin <mike@altlinux.org> 1361826022 +0400
+
+regular refactoring

.gear/tags/486bf7868d0df7b513fbfe0b048b84d15b177297

@@ -1,6 +0,0 @@
-object b74ad4d592498d38a81757d4534afecd9b18a8bf
-type commit
-tag v0.9.5
-tagger Michael Shigorin <mike@altlinux.org> 1358785513 +0200
-
-homeros

.gear/tags/list

@@ -1 +1 @@
-486bf7868d0df7b513fbfe0b048b84d15b177297 v0.9.5
+432f34bfd2a6ee1047c2c7263bca2038fe14f3e7 v0.9.9

QUICKSTART

@@ -35,6 +35,11 @@ $ mkdir ~/out
 $ make syslinux.iso
 ----
 
+список доступных целей::
+----
+$ make help
+----
+
 ссылки
 ~~~~~~
 - 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
-	@$(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; @:

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/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/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')
 
@@ -31,29 +35,35 @@ distro/live-builder: distro/live-builder-mini use/dev/repo
 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 +88,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,73 @@
 # 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 +vmguest +wireless \
-	use/live/install use/live/repo use/x11/3d-free use/systemd \
+	use/efi/signed use/luks use/memtest use/stage2/net-eth use/kernel/net
-	use/firmware/wireless use/efi/signed use/luks +plymouth \
-	+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,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 +live use/live/ru use/live/install \
+	use/live/repo use/x11/3d-free use/luks 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)
 
-distro/regular-icewm: distro/.regular-gtk +icewm use/efi/refind
+# 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_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_PACKAGES,xxkb mutt)
+	@$(call add,LIVE_PACKAGES,deepsolver deepsolver-repo)
+	@$(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-mate: distro/.regular-gtk
 	@$(call add,LIVE_LISTS,$(call tags,(desktop || mobile) && (mate || nm)))
-	@$(call add,THE_BRANDING,graphics)
 
 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
 
 distro/regular-gnome3: distro/.regular-desktop use/x11/gnome3; @:
 
-distro/regular-tde: distro/.regular-desktop +tde
+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
+distro/regular-kde4: distro/.regular-desktop use/x11/kde4 use/x11/kdm4 \
-	@$(call add,LIVE_PACKAGES,kde4-regular)
+	use/fonts/zerg +plymouth
-	@$(call add,LIVE_PACKAGES,plasma-applet-networkmanager)
+	@$(call add,LIVE_LISTS,$(call tags,regular kde4))
 
-distro/regular-razorqt: distro/.regular-desktop use/x11/razorqt use/x11/kdm4; @:
+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 \
+	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)

features.in/efi/config.mk

@@ -1,3 +1,5 @@
++efi: use/efi; @:
+
 ifeq (x86_64,$(ARCH))
 
 EFI_LISTS := $(call tags,base efi)
@@ -9,13 +11,14 @@ use/efi:
 	@$(call add,RESCUE_LISTS,$(EFI_LISTS))
 	@$(call add,THE_PACKAGES,$$(EFI_SHELL))
 	@$(call add,RESCUE_PACKAGES,refind $$(EFI_SHELL))
-	@$(call add,INSTALL2_PACKAGES,dosfstools)
+	@$(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
@@ -23,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)

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)

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/kernel/README

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

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)

features.in/live/config.mk

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

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

@@ -33,6 +33,8 @@ livecd-hostname
 livecd-save-nfs
 livecd-setauth
 livecd-setlocale
+livecd-net-eth
+livecd-install-wmaker
 network
 NetworkManager
 connman

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

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/90-rm-fbdev

@@ -0,0 +1,4 @@
+#!/bin/sh
+
+# a temporary workaround for #28669 (fall back to vesa)
+rm -f /usr/lib*/X11/modules/drivers/fbdev_drv.so

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/rescue/config.mk

@@ -1,5 +1,6 @@
 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)))

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/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/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 crda iw)
+
+use/wireless/full: use/wireless use/firmware/wireless; @:

features.in/x11/config.mk

@@ -1,5 +1,5 @@
 +icewm: use/x11/icewm; @:
-+razorqt: use/x11/razorqt use/x11/lightdm/qt; @:
++razorqt: use/x11/razorqt use/x11/lightdm/razorqt; @:
 +tde: use/x11/tde use/x11/kdm; @:
 +kde4-lite: use/x11/kde4-lite use/x11/kdm4; @:
 
@@ -31,7 +31,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
@@ -72,3 +73,15 @@ use/x11/e17: use/x11/xorg use/x11/3d-free
 
 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))

image.in/.gitignore

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

lib/profile.mk

@@ -57,15 +57,17 @@ profile/init: distclean
 		echo; \
 	} $(LOG); \
 	if ! grep -q "\<$(ARCH)\>" $(BUILDDIR)/sources.list; then \
-		echo -n "requested arch '$$ARCH' unavailable" >&2; \
+		if grep -q " noarch " $(BUILDDIR)/sources.list; then \
-		if [ -z "$(APTCONF)" ]; then \
+			echo -n "requested arch '$$ARCH' unavailable" >&2; \
-			echo " (no APTCONF)"; \
+			if [ -z "$(APTCONF)" ]; then \
-		else \
+				echo " (no APTCONF)"; \
-			echo; \
+			else \
-		fi >&2; \
+				echo; \
-		exit 1; \
+			fi >&2; \
+			exit 1; \
+		fi; \
 	fi; \
-	mp-commit "$(BUILDDIR)" "derivative profile initialized"; \
+	mp-commit -i "$(BUILDDIR)" "derivative profile initialized"; \
 	if [ -w . ]; then \
 		rm -f "$(SYMLINK)" && \
 		ln -s "$(BUILDDIR)" "$(SYMLINK)" && \

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/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

@@ -9,10 +9,10 @@ livecd-online-repo
 apt-repo
 update-kernel
 synaptic-usermode
+eepm
 
 alterator-standalone
 cpufreq-simple
 xdg-user-dirs
 firefox-ru
-uvcview
 eject

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+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
@@ -12,8 +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-upstream
+
+lxde-icon-theme
 tango-icon-theme

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

@@ -1,8 +1,8 @@
 tango-icon-theme-extras
 
-# lxterminal is reportedly sub-par (gns@) but official (aen@)
 lxde-lxterminal
-#sakura
+sakura
+fonts-bitmap-terminus
 
 leafpad
 galculator

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

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

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/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

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

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

sub.in/stage1/modules

@@ -168,7 +168,7 @@ qlogicfas408.ko
 qlogicfas.ko
 qlogicfc.ko
 qlogicisp.ko
-r8169.ko
+r8168.ko
 raid_class.ko
 reiserfs.ko
 rrunner.ko