diff options
| -rw-r--r-- | perl-install/ChangeLog | 10 | ||||
| -rw-r--r-- | perl-install/install_gtk.pm | 4 | ||||
| -rw-r--r-- | perl-install/install_steps.pm | 2 | ||||
| -rw-r--r-- | perl-install/install_steps_gtk.pm | 8 |
4 files changed, 16 insertions, 8 deletions
diff --git a/perl-install/ChangeLog b/perl-install/ChangeLog index 74cf8f9e9..3700eac4e 100644 --- a/perl-install/ChangeLog +++ b/perl-install/ChangeLog @@ -1,3 +1,13 @@ +2000-10-04 François Pons <fpons@mandrakesoft.com> + + * install_gtk.pm: removed 80 pixel on height for live upgrade. + + * install_steps.pm: do not set keyboard when live upgrade after + setting the language. + + * install_steps_gtk.pm: fixed the trying to start a X server on + live. + 2000-10-04 Pixel <pixel@mandrakesoft.com> * install_steps_interactive.pm (selectLanguage): update license diff --git a/perl-install/install_gtk.pm b/perl-install/install_gtk.pm index b5f03e7a8..4d740ae32 100644 --- a/perl-install/install_gtk.pm +++ b/perl-install/install_gtk.pm @@ -199,10 +199,8 @@ sub create_logo_window { #------------------------------------------------------------------------------ sub init_sizes() { -# my $maxheight = arch() eq "ppc" ? 1024 : 600; -# my $maxwidth = arch() eq "ppc" ? 1280 : 800; - ($::rootheight, $::rootwidth) = (480, 640); ($::rootheight, $::rootwidth) = my_gtk::gtkroot()->get_size; + $::live and $::rootheight -= 80; #- ($::rootheight, $::rootwidth) = (min(768, $::rootheight), min(1024, $::rootwidth)); ($::stepswidth, $::stepsheight) = (145, $::rootheight); ($::logowidth, $::logoheight) = ($::rootwidth - $::stepswidth, 40); diff --git a/perl-install/install_steps.pm b/perl-install/install_steps.pm index 30c60a8ef..f51a149cf 100644 --- a/perl-install/install_steps.pm +++ b/perl-install/install_steps.pm @@ -92,7 +92,7 @@ sub selectLanguage { if ($o->{keyboard_unsafe} || !$o->{keyboard}) { $o->{keyboard_unsafe} = 1; $o->{keyboard} = keyboard::lang2keyboard($o->{lang}); - selectKeyboard($o); + selectKeyboard($o) unless $::live; } } #------------------------------------------------------------------------------ diff --git a/perl-install/install_steps_gtk.pm b/perl-install/install_steps_gtk.pm index e31060cf4..d4ae5563f 100644 --- a/perl-install/install_steps_gtk.pm +++ b/perl-install/install_steps_gtk.pm @@ -35,11 +35,11 @@ sub new($$) { unless ($::testing) { $my_gtk::force_focus = $ENV{DISPLAY} eq ":0"; - my $f = "/tmp/Xconf"; - install_gtk::createXconf($f, @{$o->{mouse}}{"XMOUSETYPE", "device"}, $o->{wacom}); - devices::make("/dev/kbd"); + if ($ENV{DISPLAY} eq ":0" && !$::live) { + my $f = "/tmp/Xconf"; + install_gtk::createXconf($f, @{$o->{mouse}}{"XMOUSETYPE", "device"}, $o->{wacom}); + devices::make("/dev/kbd"); - if ($ENV{DISPLAY} eq ":0") { local (*T1, *T2); open T1, ">/dev/tty5"; open T2, ">/dev/tty6"; |