live, rescue, and use tags

features.in/live/config.mk

 use/live: use/stage2 sub/stage2/live
 	@$(call add,FEATURES,live)
-#	@$(call add,LIVE_LISTS,base-live)
+	@$(call add,LIVE_LISTS,$(call tags,(base || desktop) && (live || network || icewm)))

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

+#!/bin/sh
+# * reset password for root
+# * add user `altlinux' (without password)
+
+verbose()
+{
+    if [ -n "$GLOBAL_VERBOSE" ]; then
+        echo "HOOK: 30-users: $@"
+    fi
+}
+
+add_user()
+{
+    verbose "Add $1 user"
+    local groups=
+    for g in users scanner audio radio proc cdrom cdwriter wheel fuse; do
+	if groupmod $g 2>/dev/null; then
+	    if [ -n "$groups" ]; then
+		groups="$groups,$g"
+	    else
+		groups="$g"
+	    fi
+	fi
+    done
+
+    /usr/sbin/useradd -p "" -G "$groups" "$1" ||:
+    chown -R "$1:auth" "/etc/tcb/$1"
+    chown -R "$1:$1" /home/$1
+
+    if [ -n "$GLOBAL_CRYPT_HOMES" ]; then
+      verbose "Set password for user $1"
+      echo "$1" | passwd --stdin $1
+    fi
+
+    sudoers="/etc/sudoers"
+    if [ -w "$sudoers" ]; then
+        verbose "Add $1 to sudoers."
+        echo "$1   ALL=(root) NOPASSWD:ALL" >> "$sudoers"
+    else
+        verbose "Can't find writable $sudoers file."
+    fi
+}
+
+verbose "has started"
+
+verbose "Clear password for root account"
+/usr/sbin/usermod -p "" root
+chown -R root.auth /etc/tcb/root
+
+add_user altlinux
+
+verbose "finished"

features.in/rescue/config.mk

 use/rescue: use/stage2 sub/stage2/rescue
 	@$(call add,FEATURES,rescue)
-	@$(call add,RESCUE_LISTS,base-rescue)
+	@$(call add,RESCUE_LISTS,$(call tags,base && (rescue || network)))
+	@$(call add,RESCUE_LISTS,$(call tags,extra network))

pkg.in/lists/tagged/README

@@ -2,7 +2,7 @@
 реализация (bin/tags2lists) требует, чтобы каждый тег был
 отдельным словом, состоящим из символов из набора a-zA-Z0-9_
 (внимание: не используйте в слове "-"); рекомендуется
-разделять слова "+" или ",".
+разделять слова "+" или "," (стандарт ещё не устоялся).
 
 Предположительное применение: дополнение функциональности,
 заданной статически (наследственно или явно), факультативным

pkg.in/lists/tagged/base+live

+wget
+apt
+vim-console
+mc

pkg.in/lists/base-rescue → pkg.in/lists/tagged/base+rescue

@@ -82,15 +82,12 @@ recoverdm
 reiserfsprogs
 xfsprogs
 btrfs-progs
+ext3grep
 
 ### Applications/Networking
 arpwatch
-bridge-utils
-dhcpcd
 elinks
-etcnet
 hostinfo
-ifrename
 iftop
 iproute2
 iptables
@@ -115,8 +112,6 @@ telnet
 traceroute
 wget
 whois
-wireless-tools
-wpa_supplicant
 
 ### Applications/Shells
 zsh

pkg.in/lists/tagged/desktop+live

+xdm
+xinit
+xinitrc
+installer-feature-runlevel5-stage3

pkg.in/lists/tagged/rescue+live

+fdisk
+parted
+mdadm
+rsync
+etcnet-full