From 9849bddca8379d425c5710fefef96f836f6a63bf Mon Sep 17 00:00:00 2001
From: Pascal Rigaux <pixel@mandriva.com>
Date: Mon, 1 Sep 2008 09:04:45 +0000
Subject: - hack /tmp/.X11-unix to allow accessing X in chroot

---
 perl-install/install/NEWS         | 2 ++
 perl-install/install/steps.pm     | 5 +++++
 perl-install/install/steps_gtk.pm | 5 +++++
 3 files changed, 12 insertions(+)

diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS
index 55bacf2bc..d848ec4f4 100644
--- a/perl-install/install/NEWS
+++ b/perl-install/install/NEWS
@@ -1,3 +1,5 @@
+- hack /tmp/.X11-unix to allow accessing X in chroot
+
 Version 11.29 - 29 August 2008
 
 - do not try starting graphical installer on early i810 (which is is
diff --git a/perl-install/install/steps.pm b/perl-install/install/steps.pm
index 856e59586..652ea2f26 100644
--- a/perl-install/install/steps.pm
+++ b/perl-install/install/steps.pm
@@ -371,6 +371,11 @@ sub beforeInstallPackages {
 	cp_af("/etc/resolv.conf", "$::prefix/etc");
     }
 
+    if (-e '/tmp/.X11-unix') {
+	mkdir "$::prefix/tmp/.X11-unix";
+	run_program::run('mount', '--bind', '/tmp/.X11-unix', "$::prefix/tmp/.X11-unix");
+    }
+
     log::l("setting excludedocs to $o->{excludedocs}");
     substInFile { s/%_excludedocs.*//; $_ .= "%_excludedocs yes\n" if eof && $o->{excludedocs} } "$::prefix/etc/rpm/macros";
 
diff --git a/perl-install/install/steps_gtk.pm b/perl-install/install/steps_gtk.pm
index 9ffc9efa4..5c1a3b956 100644
--- a/perl-install/install/steps_gtk.pm
+++ b/perl-install/install/steps_gtk.pm
@@ -40,6 +40,11 @@ sub new($$) {
 	if (!$::testing) {
 	    devices::make("/dev/kbd");
 	}
+
+	#- /tmp is mostly tmpfs, but not fully, since it doesn't allow: mount --bind /tmp/.X11-unix /mnt/tmp/.X11-unix
+	mkdir '/tmp/.X11-unix';
+	run_program::run('mount', '-t', 'tmpfs', 'none', '/tmp/.X11-unix');
+
 	my $launchX = sub {
 	    my ($server, $Driver) = @_;
 
-- 
cgit v1.2.1