[debian-edu-commits] debian-edu/ 01/01: Fix code to display test result in X.
Petter Reinholdtsen
pere at moszumanska.debian.org
Thu Oct 16 21:09:03 UTC 2014
This is an automated email from the git hooks/post-receive script.
pere pushed a commit to branch master
in repository debian-edu-install.
commit 5626451cf71c90ea78377ca252bc2f31d14a3edc
Author: Petter Reinholdtsen <pere at hungry.com>
Date: Thu Oct 16 23:08:21 2014 +0200
Fix code to display test result in X.
Rewrite code in firstboot script to detect a working X frontend for
debconf to also work with the new multiarch libraries, to get the
test result presented in X.
---
debian/changelog | 3 +++
debian/debian-edu-install.xdebian-edu-firstboot.init | 11 +++++++----
2 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index fe0d20e..bd10af8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,9 @@ debian-edu-install (1.812) UNRELEASED; urgency=low
* Enable the quick installation now that bug #759590 in eatmydata is
fixed in testing.
+ * Rewrite code in firstboot script to detect a working X frontend
+ for debconf to also work with the new multiarch libraries, to get
+ the test result presented in X.
-- Petter Reinholdtsen <pere at debian.org> Thu, 16 Oct 2014 14:37:51 +0200
diff --git a/debian/debian-edu-install.xdebian-edu-firstboot.init b/debian/debian-edu-install.xdebian-edu-firstboot.init
index 566c59d..3bc68b7 100755
--- a/debian/debian-edu-install.xdebian-edu-firstboot.init
+++ b/debian/debian-edu-install.xdebian-edu-firstboot.init
@@ -127,18 +127,21 @@ prepare_debconf() {
done
if [ "$XAUTHORITY" ] ; then
+ info "found X authority file $XAUTHORITY, trying to start debconf with X frontend."
# Try to use kde frontend (require libqt-perl) or gnome frontend
# (libgtk2-perl). debconf will fall back to dialog if either
# frontend fails to start. The frontend need to be set before
# confmodule is sourced to have effect.
DISPLAY=:0
# TODO: find graphical variant that works with dialog frontend?
- if [ -f "/usr/lib/perl5/Qt.pm" ]; then
+ if perl -MGtk2 -e 'exit 0' ; then
+ # use gnome frontend
+ export DEBIAN_FRONTEND=gnome
+ elif perl -MQtCore4 -e 'exit 0' ; then
# use kde frontend
export DEBIAN_FRONTEND=kde
- elif [ -f "/usr/lib/perl5/Gtk2.pm" ]; then
- # fall back to gnome
- export DEBIAN_FRONTEND=gnome
+ else
+ info "unable to find usable debconf X frontend"
fi
export XAUTHORITY DISPLAY
elif [ -d /run/systemd/system ] ; then
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-edu/debian-edu-install.git
More information about the debian-edu-commits
mailing list