summaryrefslogtreecommitdiffstats
path: root/perl-install
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mandriva.org>2008-03-20 16:03:51 +0000
committerThierry Vignaud <tv@mandriva.org>2008-03-20 16:03:51 +0000
commitd2e116a63a8469be55c60f1d83c7465f0794b847 (patch)
treeff6a154e4398a125c412ddcd7433a361be5bfb5d /perl-install
parent6c9fd55a321183b45ee26ef13e9592084a55d6fe (diff)
downloaddrakx-d2e116a63a8469be55c60f1d83c7465f0794b847.tar
drakx-d2e116a63a8469be55c60f1d83c7465f0794b847.tar.gz
drakx-d2e116a63a8469be55c60f1d83c7465f0794b847.tar.bz2
drakx-d2e116a63a8469be55c60f1d83c7465f0794b847.tar.xz
drakx-d2e116a63a8469be55c60f1d83c7465f0794b847.zip
stop restarting XFS server
Diffstat (limited to 'perl-install')
-rw-r--r--perl-install/NEWS2
-rwxr-xr-xperl-install/standalone/drakfont8
2 files changed, 2 insertions, 8 deletions
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"));