From d2e116a63a8469be55c60f1d83c7465f0794b847 Mon Sep 17 00:00:00 2001
From: Thierry Vignaud <tv@mandriva.org>
Date: Thu, 20 Mar 2008 16:03:51 +0000
Subject: stop restarting XFS server

---
 perl-install/NEWS                | 2 ++
 perl-install/standalone/drakfont | 8 --------
 2 files changed, 2 insertions(+), 8 deletions(-)

(limited to 'perl-install')

diff --git a/perl-install/NEWS b/perl-install/NEWS
index 68b55d84d..0e060bfbe 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -1,3 +1,5 @@
+- drakfont:
+  o stop restarting XFS server
 - partitioning wizard: do not show error message in wizard mode when
   cancel is clicked (clean wizard window instead)
 
diff --git a/perl-install/standalone/drakfont b/perl-install/standalone/drakfont
index f537b37d8..cf70a1b54 100755
--- a/perl-install/standalone/drakfont
+++ b/perl-install/standalone/drakfont
@@ -34,7 +34,6 @@
 #                 - Get fonts on any partitions.
 #                 - UN-installation of any fonts (even if not installed through drakfont)
 #         - Support
-#               - Xfs
 #               - ghostscript & printer
 #               - Staroffice & printer
 #               - abiword
@@ -148,7 +147,6 @@ foreach my $i (@application) {
 }
 
 # PATH and binary full path
-#my $xfs_conffile = '/etc/fonts/fonts.conf';
 my $font_dir = '/usr/share/fonts';
 my $fontpathd_dir = '/etc/X11/fontpath.d/';
 my $drakfont_dir = "$font_dir/drakfont";
@@ -380,10 +378,6 @@ sub put_font_dir() {
         interactive_progress($pbar2, 1, N("done"));
         interactive_progress($pbar3, 0.25, N("Suppress Temporary Files"));
         my_rm_rf("$drakfont_dir/tmp/");
-        print "\n\nretarting xfs......\n";
-        interactive_progress($pbar3, 0.5, N("Restart XFS"));
-        system($update_chkfontpath);
-        system('/etc/rc.d/init.d/xfs restart');
         system('xset fp rehash');
         interactive_progress($pbar3, 0.30, N("done"));
     }
@@ -439,8 +433,6 @@ sub remove_fonts() {
         }
         interactive_progress($pbar2, 1 / @list_dir, N("Suppress Fonts Files"));
     }
-    interactive_progress($pbar2, 0.01, N("Restart XFS"));
-    system("/etc/rc.d/init.d/xfs restart");
     system('xset fp rehash');
     -e "/usr/share/ghostscript" and my_rm_rf("$drakfont_dir/remove") if !$::testing;
     interactive_progress($pbar2, 0.01, N("done"));
-- 
cgit v1.2.1