install2, syslinux: fix VNC support

Was broken in too many places including several libraries x11vnc currently links against getting removed, several utilities missing, and no way to guess what to do... One could stumble upon http://altlinux.org/vncinst or find the implementation in installer.git but it's not exactly user-friendly.

install2, syslinux: fix VNC support
c73abccd · Michael Shigorin · 20c6cb25 · c73abccd · c73abccd · c73abccd
Commit c73abccd authored Feb 01, 2017 by Michael Shigorin
4 changed files
--- a/features.in/install2/config.mk
+++ b/features.in/install2/config.mk
@@ -60,7 +60,18 @@ use/install2/vmware:

 # NB: sort of conflicts with use/install2/cleanup/vnc
 use/install2/vnc:
-	@$(call add,INSTALL2_PACKAGES,x11vnc)
+	@$(call add,INSTALL2_PACKAGES,x11vnc xterm net-tools)
+
+# this one expects external vncviewer to come
+use/install2/vnc/listen: \
+	use/install2/vnc use/syslinux/install-vnc-listen.cfg; @:
+
+# this one connects to a specified vncviewer --listen
+use/install2/vnc/connect: \
+	use/install2/vnc use/syslinux/install-vnc-connect.cfg; @:
+
+# add both bootloader items to be *that* explicit ;-)
+use/install2/vnc/full: use/install2/vnc/listen use/install2/vnc/connect; @:

 # filesystems handling
 use/install2/fs: use/install2/xfs use/install2/jfs use/install2/reiserfs; @:

--- a/features.in/install2/install2/image-scripts.d/90-install2-cleanup-bloat
+++ b/features.in/install2/install2/image-scripts.d/90-install2-cleanup-bloat
@@ -19,15 +19,18 @@ rm -rf /usr/share/awk/
 # and no systemd either
 [ -L /sbin/init ] || rm -rf /lib/systemd/system

+# save VNC install if present
+MORE=
+[ -x /usr/bin/x11vnc ] || MORE="libGL libEGL libgbm libwayland\\* xterm"
+
 ### could it be handled with any grace?
 rpmquery -a common-licenses \
 	cpp\* gcc\* perl-base file ipv6calc \
 	bind-utils libbind \
 	libmpfr\* libmpc\* \
 	libsoup\* \
-	libwayland\* libgbm \
-	libGL libEGL glxinfo xdriinfo \
-	xdg-utils xterm \
+	$MORE glxinfo xdriinfo \
+	xdg-utils \
 	mkfontscale mkfontdir \
 	make make-initrd \
 | xargs -r rpmi -e --nodeps --

--- a/features.in/syslinux/cfg.in/25install-vnc-connect.cfg
+++ b/features.in/syslinux/cfg.in/25install-vnc-connect.cfg
+label linux
+  menu label ^VNC install (<Tab>, IP of vncviewer --listen)
+  kernel alt0/vmlinuz
+  append initrd=alt0/full.cz changedisk fastboot automatic=method:cdrom ramdisk_size=@altinst_size@ showopts @bootargs@ headless vncconnect=IP
+
--- a/features.in/syslinux/cfg.in/25install-vnc-listen.cfg
+++ b/features.in/syslinux/cfg.in/25install-vnc-listen.cfg
+label linux
+  menu label VNC install (<Tab>, set pass^word and connect here)
+  kernel alt0/vmlinuz
+  append initrd=alt0/full.cz changedisk fastboot automatic=method:cdrom ramdisk_size=@altinst_size@ showopts @bootargs@ headless vncpasswd=VNCPWD
+