rescue: experimental test to check for libX11

This has been spotted and solved manually several times already, and that's just boring so let's add the ability to state that X11-based software is not accepted into a particular rescue image. Not that I would hate X but things like that belong to a carefully crafted image which includes either X server or reasonable means to ensure that GUI software can actually be used. NB: this is a somewhat new entity: test/rescue/no-x11 knob for an image-script intended to make it blow up the build when libX11 is found within the chroot that makes up the rescue image's filesystem. The interface is not documented intentionally: it will take some time to find out whether it sticks or is bad enough. Please do remind/ask if interested in using that.

rescue: experimental test to check for libX11
711ae1ee · Michael Shigorin · e06090a1 · 711ae1ee · 711ae1ee
Commit 711ae1ee authored Jan 17, 2014 by Michael Shigorin
Show whitespace changes
Inline Side-by-side

Showing with 19 additions and 0 deletions

config.mk features.in/rescue/config.mk +6 -0

00-test-rescue features.in/rescue/rescue/image-scripts.d/00-test-rescue +13 -0

No files found.
--- a/features.in/rescue/config.mk
+++ b/features.in/rescue/config.mk
@@ -26,3 +26,9 @@ use/rescue/rw: use/rescue use/syslinux
 else
 use/rescue/rw: use/rescue; @:
 endif
+
+test/rescue:
+	@$(call xport,TEST_RESCUE)
+
+test/rescue/no-x11: test/rescue
+	@$(call add,TEST_RESCUE,no-x11)
--- a/features.in/rescue/rescue/image-scripts.d/00-test-rescue
+++ b/features.in/rescue/rescue/image-scripts.d/00-test-rescue
+#!/bin/sh -efu
+
+no_x11() {
+	if rpmquery libX11 >&/dev/null; then
+		echo "** rescue image contains libX11 which is prohibited" >&2
+		exit 1
+	fi
+}
+
+case "${GLOBAL_TEST_RESCUE:-}" in
+*no-x11*)
+	no_x11;;
+esac