diff options
| author | Guillaume Cottenceau <gc@mandriva.com> | 2003-11-26 13:01:01 +0000 |
|---|---|---|
| committer | Guillaume Cottenceau <gc@mandriva.com> | 2003-11-26 13:01:01 +0000 |
| commit | 11192b58aa0053df80faebe224e3cf7f83d822cb (patch) | |
| tree | a4a1aadd3141692ec331f2f02dee8b7b2ab37948 /perl-install/install_steps_gtk.pm | |
| parent | a97b85927a0405108abb72479240d76a8c3f5097 (diff) | |
| download | drakx-backup-do-not-use-11192b58aa0053df80faebe224e3cf7f83d822cb.tar drakx-backup-do-not-use-11192b58aa0053df80faebe224e3cf7f83d822cb.tar.gz drakx-backup-do-not-use-11192b58aa0053df80faebe224e3cf7f83d822cb.tar.bz2 drakx-backup-do-not-use-11192b58aa0053df80faebe224e3cf7f83d822cb.tar.xz drakx-backup-do-not-use-11192b58aa0053df80faebe224e3cf7f83d822cb.zip | |
allow X to restart after dying through X_move script, startkde also through startkde_move script
Diffstat (limited to 'perl-install/install_steps_gtk.pm')
| -rw-r--r-- | perl-install/install_steps_gtk.pm | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/perl-install/install_steps_gtk.pm b/perl-install/install_steps_gtk.pm index 82e962140..ba34a9205 100644 --- a/perl-install/install_steps_gtk.pm +++ b/perl-install/install_steps_gtk.pm @@ -107,13 +107,13 @@ sub new($$) { require run_program; move::automatic_xconf($o); run_program::run('/sbin/service', 'xfs', 'start'); - @servers = qw(X); + @servers = qw(X_move); } foreach (@servers) { log::l("Trying with server $_"); my $dir = "/usr/X11R6/bin"; - my ($prog, $Driver) = /Driver:(.*)/ ? ('XFree86', $1) : /Xsun|Xpmac|Xnest|^X$/ ? $_ : "XF86_$_"; + my ($prog, $Driver) = /Driver:(.*)/ ? ('XFree86', $1) : /Xsun|Xpmac|Xnest|^X_move$/ ? $_ : "XF86_$_"; unless (-x "$dir/$prog") { unlink $_ foreach glob_("$dir/X*"); install_any::getAndSaveFile("Mandrake/mdkinst$dir/$prog", "$dir/$prog") or die "failed to get server $prog: $!"; |