From be4f26c73d9caab8835f185ae3f7736165b315e3 Mon Sep 17 00:00:00 2001
From: Francois Pons <fpons@mandriva.com>
Date: Fri, 27 Oct 2000 12:03:52 +0000
Subject: Make sure to remove font path in /tmp/drakx before exiting.

---
 perl-install/live_install2 | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/perl-install/live_install2 b/perl-install/live_install2
index e2a07f4c5..6745b12b1 100755
--- a/perl-install/live_install2
+++ b/perl-install/live_install2
@@ -11,13 +11,14 @@ $ENV{SHARE_PATH} = "$dir/usr/share";
 
 system "../../../lib/ld-linux.so.2", "../perl", "./install2", "--live", @ARGV;
 
+$ENV{DISPLAY} and system "xset", "-fp", "/tmp/drakx/mdkinst/usr/X11R6/lib/X11/fonts/";
 foreach (qw(misc PEX Speedo Type1 mdk 75dpi 100dpi cyrillic)) {
     -d "/usr/X11R6/lib/X11/fonts/$_" or next;
     -e "/usr/X11R6/lib/X11/fonts/$_/fonts.dir" and next;
     chdir "/usr/X11R6/lib/X11/fonts/$_";
     system "mkfontdir";
-    $ENV{DISPLAY} and system "xset", "fp", "rehash";
 }
+$ENV{DISPLAY} and system "xset", "fp", "rehash";
 
 system "/bin/rm", "-rf", "/tmp/drakx";
 system "/bin/rm", "-rf", "/tmp/rhimage";
-- 
cgit v1.2.1