From 1fd7171432a46f572eaef7c71a6ffe6dc50f479f Mon Sep 17 00:00:00 2001
From: Thierry Vignaud <tv@mandriva.org>
Date: Wed, 8 Oct 2008 14:39:55 +0000
Subject: do not start an X server if using --text

---
 perl-install/install/NEWS | 2 ++
 tools/drakx-in-chroot     | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS
index 6ce8a9957..a1a9fe58c 100644
--- a/perl-install/install/NEWS
+++ b/perl-install/install/NEWS
@@ -1,3 +1,5 @@
+- drakx-in-chroot:
+  o do not start an X server if using --text
 - continue installing if an advertising image is corrupted (#37674)
 
 Version 11.68 - 3 October 2008
diff --git a/tools/drakx-in-chroot b/tools/drakx-in-chroot
index 5feac78e9..6494c39f4 100755
--- a/tools/drakx-in-chroot
+++ b/tools/drakx-in-chroot
@@ -100,7 +100,7 @@ eval { cp_af($_, "$SLASH_LOCATION$_") } foreach qw(/etc/resolv.conf);
 
 my $Xnest_pid;
 my $Xnest_bin = find { whereis_binary($_) } 'Xephyr', 'Xnest';
-if (!-f ($SLASH_LOCATION . $AUTO_INSTALL_ROOTED) && $Xnest_bin) {
+if (!-f ($SLASH_LOCATION . $AUTO_INSTALL_ROOTED) && $Xnest_bin && (join('', @ARGV) !~ /--text/)) {
     my $DISPLAY = ':8';
     $Xnest_pid = fork();
     if (!$Xnest_pid) {
-- 
cgit v1.2.1