diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 2005-05-26 08:17:27 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 2005-05-26 08:17:27 +0000 |
| commit | 0389f5e245a572f88b4ca3b79e97c496d2537a09 (patch) | |
| tree | 98afb07f442d2a5110f77ca1d542cdcda280db50 /perl-install/install_steps_gtk.pm | |
| parent | 0b3ea64c4e843ea2b83241c196fffdfe255d3f84 (diff) | |
| download | drakx-0389f5e245a572f88b4ca3b79e97c496d2537a09.tar drakx-0389f5e245a572f88b4ca3b79e97c496d2537a09.tar.gz drakx-0389f5e245a572f88b4ca3b79e97c496d2537a09.tar.bz2 drakx-0389f5e245a572f88b4ca3b79e97c496d2537a09.tar.xz drakx-0389f5e245a572f88b4ca3b79e97c496d2537a09.zip | |
replace unused $o->{localInstall} with $::local_install, partially used instead of $::uml_install
and used in drakx-in-chroot
Diffstat (limited to 'perl-install/install_steps_gtk.pm')
| -rw-r--r-- | perl-install/install_steps_gtk.pm | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/perl-install/install_steps_gtk.pm b/perl-install/install_steps_gtk.pm index 764fae2f8..59f50ccdb 100644 --- a/perl-install/install_steps_gtk.pm +++ b/perl-install/install_steps_gtk.pm @@ -33,7 +33,8 @@ sub new($$) { $ENV{DISPLAY} ||= $o->{display} || ":0"; my $wanted_DISPLAY = $::testing && -x '/usr/X11R6/bin/Xnest' ? ':9' : $ENV{DISPLAY}; - if ($ENV{DISPLAY} =~ /^:\d/ && !$::testing || $ENV{DISPLAY} ne $wanted_DISPLAY) { #- is the display local or distant? + if (!$::local_install && + ($::testing ? $ENV{DISPLAY} ne $wanted_DISPLAY : $ENV{DISPLAY} =~ /^:\d/)) { #- is the display local or distant? my $f = "/tmp/Xconf"; if (!$::testing) { devices::make("/dev/kbd"); |