cleanup: add CLEANUP_AUTO_PACKAGES for safe live package removal

conf.d/ximper.mk

@@ -20,6 +20,7 @@ use/ximper/cleanup:
 	@$(call add,CLEANUP_BASE_PACKAGES,branding-etersoft-ximper-alterator)
 	@$(call add,CLEANUP_BASE_PACKAGES,'alterator*' rpm-macros-alterator)
 	@$(call add,CLEANUP_BASE_PACKAGES,'guile*' libvhttpd autologin-sh-functions)
+	@$(call add,CLEANUP_AUTO_PACKAGES,$(LIVE_PACKAGES))
 
 use/ximper/cleanup/x11: \
 	use/ximper/cleanup

features.in/cleanup/README

@@ -14,5 +14,11 @@ CLEANUP_BASE_PACKAGES.
 Для удаления пакетов только из livecd используйте переменную
 CLEANUP_LIVE_PACKAGES.
 
+Для пакетов, которые следует пометить как auto-installed при
+установке с livecd (будут удалены через autoremove, если не нужны
+пользователю), используйте переменную CLEANUP_AUTO_PACKAGES.
+Это безопаснее чем CLEANUP_BASE_PACKAGES: пакет не удалится,
+если он требуется выбранным пользователем группам.
+
 CAUTION: также удаляет rpm, apt и базу по пакетам из livecd,
 если в него не был добавлен инсталятор!

features.in/cleanup/config.mk

@@ -5,6 +5,7 @@ use/cleanup:
 	@$(call xport,CLEANUP_PACKAGES)
 	@$(call xport,CLEANUP_BASE_PACKAGES)
 	@$(call xport,CLEANUP_LIVE_PACKAGES)
+	@$(call xport,CLEANUP_AUTO_PACKAGES)
 
 use/cleanup/live-no-cleanupdb:
 	@$(call set,LIVE_NO_CLEANUPDB,yes)

features.in/cleanup/live/image-scripts.d/89-cleanup-live-preinstall

+#!/bin/sh -efu
+### create a preinstall hook to mark live-only packages as auto-installed
+
+[ -n "$GLOBAL_CLEANUP_AUTO_PACKAGES" ] || exit 0
+
+[ -x /usr/sbin/install2 ] || [ -x /usr/libexec/install2/install2 ] || exit 0
+
+CLEANUP_AUTO_PACKAGES="$GLOBAL_CLEANUP_AUTO_PACKAGES"
+
+HOOKDIR="/usr/lib/alterator/hooks/pkg-preinstall.d"
+mkdir -p "$HOOKDIR"
+
+SCRIPT="$HOOKDIR/01-mark-live-packages-auto"
+
+cat > "$SCRIPT" << EOF
+#!/bin/sh -efu
+# Mark live-only packages as auto-installed before pkg-install runs.
+# pkg-install will then mark .base and selected groups as manual,
+# overwriting our auto marks for packages that should be kept.
+# Finally, postinstall autoremove will remove orphaned auto packages.
+
+list="\$(rpmquery -a --qf='%{NAME}\n' $CLEANUP_AUTO_PACKAGES 2>/dev/null)" ||:
+[ -z "\$list" ] || apt-mark auto \$list 2>/dev/null ||:
+EOF
+chmod +x "$SCRIPT"

features.in/cleanup/live/image-scripts.d/90-cleanup-live-install-pkgs

@@ -7,7 +7,8 @@ if [ -n "$GLOBAL_VERBOSE" ]; then
 fi >&2
 
 [ -n "$GLOBAL_CLEANUP_PACKAGES" ] ||
-	[ -n "$GLOBAL_CLEANUP_BASE_PACKAGES" ] || exit 0
+	[ -n "$GLOBAL_CLEANUP_BASE_PACKAGES" ] ||
+	[ -n "$GLOBAL_CLEANUP_AUTO_PACKAGES" ] || exit 0
 
 [ -x /usr/sbin/install2 ] || [ -x /usr/libexec/install2/install2 ] || exit 0
 
@@ -27,7 +28,8 @@ echo "removing $CLEANUP_PACKAGES"
 list="\$(exec_chroot rpmquery -a --qf='%{NAME}\\n' $CLEANUP_PACKAGES)"
 if [ -n "\$list" ]; then
 	exec_chroot apt-get remove -f -y  -- \$list
-	exec_chroot apt-get autoremove -y
 fi
+
+exec_chroot apt-get autoremove -y
 EOF
 chmod +x "$SCRIPT"