summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2004-12-31 09:11:52 +0000
committerPascal Rigaux <pixel@mandriva.com>2004-12-31 09:11:52 +0000
commitab55f25b7ccf9c7617106b44e7801e4a558f75c6 (patch)
tree2153e198f817a0d1fcadf9a7c3e36a3e7cfc173a
parent2e2eb6715a0db4b076781984140ae61ea04f0cde (diff)
downloaddrakx-backup-do-not-use-ab55f25b7ccf9c7617106b44e7801e4a558f75c6.tar
drakx-backup-do-not-use-ab55f25b7ccf9c7617106b44e7801e4a558f75c6.tar.gz
drakx-backup-do-not-use-ab55f25b7ccf9c7617106b44e7801e4a558f75c6.tar.bz2
drakx-backup-do-not-use-ab55f25b7ccf9c7617106b44e7801e4a558f75c6.tar.xz
drakx-backup-do-not-use-ab55f25b7ccf9c7617106b44e7801e4a558f75c6.zip
remove code using getAndSaveFile to get the X server
(we don't have live directory anymore, and anyway we only use one X server)
-rw-r--r--perl-install/install_steps_gtk.pm5
1 files changed, 0 insertions, 5 deletions
diff --git a/perl-install/install_steps_gtk.pm b/perl-install/install_steps_gtk.pm
index efd7fe8c2..3962905cc 100644
--- a/perl-install/install_steps_gtk.pm
+++ b/perl-install/install_steps_gtk.pm
@@ -120,11 +120,6 @@ sub new($$) {
log::l("Trying with server $_");
my $dir = "/usr/X11R6/bin";
my ($prog, $Driver) = /Driver:(.*)/ ? ('Xorg', $1) : /Xsun|Xnest|^X_move$/ ? $_ : "XF86_$_";
- unless (-x "$dir/$prog") {
- unlink $_ foreach glob_("$dir/X*");
- install_any::getAndSaveFile("install/stage2/live$dir/$prog", "$dir/$prog") or die "failed to get server $prog: $!";
- chmod 0755, "$dir/$prog";
- }
if (/FB/i) {
!$o->{vga16} && $o->{allowFB} or next;