0.9.7-alt1

- going nightly

.gear/mkimage-profiles.spec

@@ -1,5 +1,5 @@
 Name: mkimage-profiles
-Version: 0.9.2
+Version: 0.9.7
 Release: alt1
 
 Summary: ALT Linux based distribution metaprofile
@@ -78,6 +78,21 @@ cp -a * %buildroot%mpdir
 %doc %docs/*
 
 %changelog
+* 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
+
+* Mon Dec 31 2012 Michael Shigorin <mike@altlinux.org> 0.9.3-alt1
+- regular images
+
 * Mon Dec 17 2012 Michael Shigorin <mike@altlinux.org> 0.9.2-alt1
 - enhanced uefi support
 

.gear/tags/25f0420130990a8bfd7b5e91435ac54c7f8eee33

@@ -1,6 +0,0 @@
-object 919b09313f3be5702cb8e83f9d0372f4d06ed6f3
-type commit
-tag v0.9.1
-tagger Michael Shigorin <mike@altlinux.org> 1354548428 +0200
-
-kde4

.gear/tags/a3ac943cc53163809f63f514f0f0cc33fff19119

@@ -0,0 +1,6 @@
+object 5fcc2aaa78b5704b4bc4ec448322680efa2cc332
+type commit
+tag v0.9.6
+tagger Michael Shigorin <mike@altlinux.org> 1360001972 +0400
+
+assorted fixes

.gear/tags/list

@@ -1 +1 @@
-25f0420130990a8bfd7b5e91435ac54c7f8eee33 v0.9.1
+a3ac943cc53163809f63f514f0f0cc33fff19119 v0.9.6

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

bin/tags2lists

@@ -30,4 +30,4 @@ transformed="$(sed \
 	-e "s, *) *, ) ,g")"
 
 [ "$DEBUG" = 2 ] && echo "`basename $0`: transformed = \"$transformed\"" >&2
-[ -z "$transformed" ] || find $transformed | sed 's,^\./,,'
+[ -z "$transformed" ] || find $transformed | sed 's,^\./,,' | grep -v '\.sw.$'

conf.d/desktop.mk

@@ -17,7 +17,7 @@ distro/.desktop-extra:
 distro/tde: distro/.desktop-mini +tde
 	@$(call set,KFLAVOURS,led-ws)
 
-distro/kde-lite: distro/.desktop-mini distro/.desktop-network distro/.desktop-extra +kde
+distro/kde4-lite: distro/.desktop-mini distro/.desktop-network distro/.desktop-extra +kde4-lite
 	@$(call set,KFLAVOURS,std-def)
 
 distro/icewm: distro/.desktop-network use/lowmem use/install2/fs +icewm; @:

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,7 +2,7 @@
 ifeq (distro,$(IMAGE_CLASS))
 
 distro/dos: distro/.init use/dos use/syslinux/ui/menu; @:
-distro/rescue: distro/.base use/rescue use/syslinux/ui/menu; @:
+distro/rescue: distro/.base use/rescue use/efi/signed use/syslinux/ui/menu; @:
 distro/syslinux: distro/.init \
 	use/syslinux/localboot.cfg use/syslinux/ui/vesamenu use/hdt; @:
 
@@ -35,7 +35,7 @@ distro/live-icewm: distro/.live-desktop use/live/autologin +icewm; @:
 distro/live-razorqt: distro/.live-desktop use/live/autologin +razorqt; @:
 distro/live-tde: distro/.live-desktop-ru use/live/install +tde; @:
 
-distro/live-rescue: distro/live-icewm
+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)))
@@ -68,8 +68,8 @@ distro/live-mate: distro/.live-desktop-ru use/live/nodm use/x11/3d-free
 	@$(call add,LIVE_LISTS,openssh $(call tags,(desktop || mobile) && mate))
 	@$(call set,KFLAVOURS,un-def)	# the newest one
 
-distro/live-enlightenment: distro/.live-desktop-ru use/live/autologin use/x11/3d-free
+distro/live-e17: distro/.live-desktop-ru use/live/autologin \
-	@$(call add,LIVE_PACKAGES,enlightenment)
+	use/x11/e17 use/x11/gdm2.20; @:
 
 distro/live-gimp: distro/live-icewm use/x11/3d-free use/live/ru
 	@$(call add,LIVE_PACKAGES,gimp tintii immix fim)

conf.d/regular.mk

@@ -0,0 +1,50 @@
+# 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/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,STAGE1_PACKAGES,udev-rule-generator-net)
+	@$(call add,STAGE2_PACKAGES,udev-rule-generator-net)
+	@$(call add,THE_BRANDING,indexhtml notes alterator bootloader)
+	@$(call set,KFLAVOURS,std-def)
+	@$(call add,KMODULES,r8168)
+	@$(call try,SAVE_PROFILE,yes)
+
+distro/.regular-gtk: distro/.regular-desktop use/x11/lightdm/gtk +plymouth; @:
+	@$(call add,THE_BRANDING,graphics)
+
+distro/regular-icewm: distro/.regular-gtk +icewm use/efi/refind
+	@$(call add,LIVE_PACKAGES,xxkb mutt)
+
+distro/regular-xfce: distro/.regular-gtk use/x11/xfce; @:
+distro/regular-lxde: distro/.regular-gtk use/x11/lxde; @:
+
+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)
+
+distro/regular-cinnamon: distro/.regular-desktop use/x11/cinnamon
+	@$(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 +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-razorqt: distro/.regular-desktop use/x11/razorqt use/x11/kdm4 \
+	+plymouth; @:
+
+endif

conf.d/server.mk

@@ -9,8 +9,9 @@ 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
+distro/server-mini: distro/.server-base use/server/mini \
-	@$(call set,KFLAVOURS,el-smp)
+	use/cleanup/x11-alterator use/efi
+	@$(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

conf.d/test.mk

@@ -19,9 +19,6 @@ 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)
 

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
 ** ожидает, что каждая подлежащая трассированию цель каждого

features.in/README

@@ -23,9 +23,14 @@
 построенных на одном базовом, можно воспользоваться подкаталогом
 с именем исходного базового субпрофиля (см. $src, $dst в Makefile).
 
+Рекомендуется давать несколько различающиеся имена скриптам,
+которые одна и та же фича может добавлять в различные стадии,
+чтобы они не выглядели одинаково в логе сборки.
+
 Наиболее востребованные цели можно снабжать "ярлычками" вроде
 "+icewm" с тем, чтобы сделать более краткими и выразительными
-использующие их правила.  Просьба не злоупотреблять количеством.
+использующие их правила.  Просьба не злоупотреблять количеством,
+такие имена предполагается показывать в интерфейсе к профилю.
 
 Каталог lib/ является специфическим для фич, определяющих
 построение конкретного вида образа -- см. build-*/.

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/build-ve/image-scripts.d/90-firsttime

@@ -0,0 +1,3 @@
+#!/bin/sh
+# Run scripts from /etc/firsttime.d at first start
+[ -f "/var/lock/TMP_1ST" ] || touch "/var/lock/TMP_1ST"

features.in/build-vm/image-scripts.d/90-firsttime

@@ -0,0 +1,3 @@
+#!/bin/sh
+# Run scripts from /etc/firsttime.d at first start
+[ -f "/var/lock/TMP_1ST" ] || touch "/var/lock/TMP_1ST"

features.in/efi/README

@@ -1,5 +1,9 @@
 Фича добавляет в образы необходимое для поддержки EFI/UEFI.
 
+Конфигурируется заданием загрузчика (EFI_BOOTLOADER)
+и файла сертификата (EFI_CERT) при помощи целей;
+пример использования доступен в ../../conf.d/regular.mk
+
 См. тж.:
 * http://www.altlinux.org/UEFI
 * http://www.rodsbooks.com/efi-bootloaders/

features.in/efi/config.mk

@@ -1,10 +1,37 @@
+ifeq (x86_64,$(ARCH))
+
+EFI_LISTS := $(call tags,base efi)
+
 use/efi:
 	@$(call add_feature)
 	@$(call set,MKI_VER_MINIMAL,0.2.5)	# see #28219
-	@$(call add,THE_LISTS,$(call tags,base efi))
+	@$(call add,THE_LISTS,$(EFI_LISTS))
-	@$(call add,INSTALL2_PACKAGES,dosfstools)
+	@$(call add,RESCUE_LISTS,$(EFI_LISTS))
-	@$(call set,EFI_BOOTLOADER,elilo)	### no choice right now
+	@$(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,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 set,EFI_SHELL,efi-shell)
 
 use/efi/debug: use/efi
 	@$(call add,STAGE2_PACKAGES,efibootmgr gdisk)
 	@$(call set,KFLAVOURS,led-ws)
+
+else
+
+# ignore on an unsupported target arch but make it hybrid at least
+use/efi use/efi/refind use/efi/signed use/efi/shell use/efi/debug: use/isohybrid
+
+endif

features.in/firmware/config.mk

@@ -5,6 +5,8 @@
 use/firmware:
 	@$(call add_feature)
 	@$(call add,SYSTEM_PACKAGES,firmware-linux)
+	@$(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)

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

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

features.in/kernel/config.mk

@@ -1,4 +1,10 @@
-###
+# 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)

features.in/live/config.mk

@@ -21,9 +21,15 @@ use/live/desktop: use/live/base use/x11/wacom use/live/sound +vmguest +power
 	@$(call add,LIVE_PACKAGES,pciutils)
 	@$(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)
+	@$(call add,LIVE_PACKAGES,installer-feature-online-repo)
+
 # alterator-based permanent installation
 use/live/install: use/metadata use/syslinux/localboot.cfg
 	@$(call add,LIVE_PACKAGES,livecd-install)
+	@$(call add,LIVE_PACKAGES,livecd-installer-features)
 
 # text-based installation script
 use/live/textinstall: 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,14 @@ livecd-hostname
 livecd-save-nfs
 livecd-setauth
 livecd-setlocale
+livecd-net-eth
 network
 NetworkManager
+connman
 random
 rpcbind
+plymouth
+avahi-daemon
 "
 
 # NB: dnsmasq: https://bugzilla.altlinux.org/show_bug.cgi?id=18799

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

@@ -1,8 +1,10 @@
 #!/bin/sh -efu
 # if no means for locale setup are employed,
-# it should still be somewhat reasonable
+# it should still be at least marginally reasonable
 # NB: keyboard layout not included!
 
+if [ -s /etc/sysconfig/i18n ]; then exit 0; fi
+
 mkdir -p /etc/sysconfig
 cat >> /etc/sysconfig/i18n << _EOF_
 # mkimage-profiles live 20-locale hook

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

@@ -2,5 +2,11 @@
 # Turn on xdg-user-dirs.
 # NB: not yet available on t6/p6 hence the warning
 
-control xdg-user-dirs enabled ||
+. shell-config
+
+if control xdg-user-dirs enabled; then
+	shell_config_set /etc/xdg/user-dirs.defaults MOVIES 'Documents/Videos'
+	shell_config_set /etc/xdg/user-dirs.defaults PHOTOS 'Documents/Pictures'
+else
 	echo "** warning: control xdg-user-dirs failed" >&2
+fi

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

@@ -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,61 +45,92 @@ 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
 
-## kdm3 autologin
+autologin_kdm() {
-# TODO: iterate over kdm{,4} if feasible
+	backup "$1"
-KDMRC=/etc/X11/kdm/kdmrc
-if [ -f "$KDMRC" ]; then
 	sed -i \
 		-e '/AutoLoginEnable/ s,^.*$,AutoLoginEnable=true,' \
 		-e '/AutoLoginUser/ s,^.*$,AutoLoginUser='$USER',' \
-		"$KDMRC"
+		"$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
+
+## kdm4 autologin
+KDMRC=/etc/X11/kdm4/kdmrc
+if [ -f "$KDMRC" ]; then autologin_kdm "$KDMRC"; fi
+
 ## nodm autologin (the last since the most intrusive)
 # FIXME nodm and xinitrc should be modified (also in p6)
 NODM_RC=/etc/sysconfig/nodm
 NODM_EXE=/usr/sbin/nodm
-
 if [ -x "$NODM_EXE" ]; then
-	cat << E_O_F >> "$NODM_RC"
+	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/luks/config.mk

@@ -1,2 +1,5 @@
+LUKS_LISTS := $(call tags,security luks)
+
 use/luks:
-	@$(call add,BASE_PACKAGES,make-initrd-luks cryptsetup)
+	@$(call add,THE_LISTS,$(LUKS_LISTS))
+	@$(call add,RESCUE_LISTS,$(LUKS_LISTS))

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

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

features.in/wireless/config.mk

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

features.in/x11/config.mk

@@ -1,7 +1,7 @@
 +icewm: use/x11/icewm; @:
 +razorqt: use/x11/razorqt use/x11/lightdm/qt; @:
 +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 +16,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)
@@ -52,11 +52,23 @@ 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)
 
 use/x11/xfce: use/x11/xorg
 	@$(call add,THE_LISTS,$(call tags,xfce desktop))
 
 use/x11/cinnamon: use/x11/xorg use/x11/drm
 	@$(call add,THE_LISTS,$(call tags,cinnamon desktop))
+
+use/x11/gnome3: use/x11/xorg use/x11/drm
+	@$(call add,THE_PACKAGES,gnome3-default)
+
+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))

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

@@ -3,7 +3,7 @@ ANSI_OK   ?= 1;32
 ANSI_FAIL ?= 1;31
 
 MAX_ERRORS = 3
-GOTCHA := ^(((\*\* )?(E:|[Ee]rror|[Ww]arning).*)|(.* (conflicts|Depends:) .*)|(.* (Stop|failed|not found)\.))$$
+GOTCHA := ^(((\*\* )?(E:|[Ee]rror|[Ww]arning).*)|(.* (FAILURE|FATAL|ERROR|conflicts|Depends:) .*)|(.* (Stop|failed|not found)\.))$$
 
 ifndef MKIMAGE_PROFILES
 $(error this makefile is designed to be included in toplevel one)
@@ -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

@@ -65,7 +65,7 @@ profile/init: distclean
 		fi >&2; \
 		exit 1; \
 	fi; \
-	mp-commit "$(BUILDDIR)" "derivative profile initialized"; \
+	mp-commit -i "$(BUILDDIR)" "derivative profile initialized"; \
 	if [ -w . ]; then \
 		rm -f "$(SYMLINK)" && \
 		ln -s "$(BUILDDIR)" "$(SYMLINK)" && \
@@ -82,8 +82,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,23 @@
+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
+
+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/tagged/base+efi

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

pkg.in/lists/tagged/base+regular

@@ -0,0 +1,19 @@
+openssh
+net-tools
+
+strace
+powertop
+acpi
+
+livecd-net-eth
+livecd-online-repo
+apt-repo
+update-kernel
+synaptic-usermode
+
+alterator-standalone
+cpufreq-simple
+xdg-user-dirs
+firefox-ru
+uvcview
+eject

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

@@ -0,0 +1,3 @@
+e17-default
+evas_generic_loaders
+gnome-icon-theme

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

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

pkg.in/lists/tagged/desktop+lxde

@@ -0,0 +1,19 @@
+openbox
+
+pcmanfm2
+
+lxde-common
+lxde-lxpanel
+lxde-lxsession
+lxde-lxsession-edit
+lxde-lxrandr
+lxde-lxtask
+lxde-lxshortcut
+lxde-lxappearance
+lxde-lxappearance-obconf
+lxde-lxshortcut
+
+menu-cache
+altlinux-freedesktop-menu-lxde
+
+tango-icon-theme

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

@@ -0,0 +1,26 @@
+tango-icon-theme-extras
+
+# lxterminal is reportedly sub-par (gns@) but official (aen@)
+lxde-lxterminal
+#sakura
+
+leafpad
+galculator
+deadbeef
+mtpaint
+parcellite
+
+# gqview has thumbnails support, gpicview doesn't
+gqview
+
+# 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,3 +1,5 @@
+mate-default
+
 altlinux-freedesktop-menu-mate
 mate-conf-gtk
 mate-control-center
@@ -29,13 +31,13 @@ mate-document-viewer-djvu
 mate-file-archiver
 mate-image-viewer
 mate-media
-mate-media-apps
+#mate-media-apps
 mate-netspeed
 mate-power-manager
 mate-screensaver
 mate-terminal
 mate-utils
-mate-utils-mate-system-log
+#mate-utils-mate-system-log
 
 mate-file-manager-extensions
 mate-file-manager-image-converter
@@ -45,6 +47,5 @@ parcellite
 
 ### should be dropped at some stage; see bugreports within this thread:
 # http://lists.altlinux.org/pipermail/sisyphus/2012-August/358079.html
-libmatekbd-capplet
 iso-codes
 tzdata

pkg.in/lists/tagged/desktop+nm

@@ -0,0 +1,10 @@
+NetworkManager
+NetworkManager-vpnc
+NetworkManager-openvpn
+NetworkManager-pptp
+#NetworkManager-l2tp
+NetworkManager-openvpn-gnome
+NetworkManager-pptp-gnome
+NetworkManager-vpnc-gnome
+#NetworkManager-l2tp-gnome
+usb-modeswitch