diff options
Diffstat (limited to 'perl-install/install')
| -rw-r--r-- | perl-install/install/NEWS | 1 | ||||
| -rw-r--r-- | perl-install/install/steps_interactive.pm | 71 |
2 files changed, 36 insertions, 36 deletions
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS index d7a8d5069..2f76c8a78 100644 --- a/perl-install/install/NEWS +++ b/perl-install/install/NEWS @@ -1,3 +1,4 @@ +- reorder steps according to specs - restore progress bar when formatting ext3 - fix range max value >2TB when creating a partition (useful for LVs >2TB) diff --git a/perl-install/install/steps_interactive.pm b/perl-install/install/steps_interactive.pm index 3f8e9bd0f..acf5fc2b4 100644 --- a/perl-install/install/steps_interactive.pm +++ b/perl-install/install/steps_interactive.pm @@ -744,14 +744,13 @@ sub summary { my @l; + my $timezone_manually_set; push @l, { - group => N("System"), - label => N("Keyboard"), - val => sub { $o->{keyboard} && translate(keyboard::keyboard2text($o->{keyboard})) }, - clicked => sub { $o->selectKeyboard(1) }, + group => N("System"), + label => N("Timezone"), + val => sub { $o->{timezone}{timezone} }, + clicked => sub { $timezone_manually_set = $o->configureTimezone(1) || $timezone_manually_set }, }; - - my $timezone_manually_set; push @l, { group => N("System"), label => N("Country / Region"), @@ -772,13 +771,40 @@ sub summary { }; push @l, { group => N("System"), - label => N("Timezone"), - val => sub { $o->{timezone}{timezone} }, - clicked => sub { $timezone_manually_set = $o->configureTimezone(1) || $timezone_manually_set }, + label => N("Bootloader"), + val => sub { + #-PO: example: lilo-graphic on /dev/hda1 + N("%s on %s", $o->{bootloader}{method}, $o->{bootloader}{boot}); + }, + clicked => sub { + any::setupBootloader($o, $o->{bootloader}, $o->{all_hds}, $o->{fstab}, $o->{security}) or return; + any::installBootloader($o, $o->{bootloader}, $o->{all_hds}); + }, }; push @l, { group => N("System"), + label => N("Services"), + val => sub { + require services; + my ($l, $activated) = services::services(); + N("Services: %d activated for %d registered", int(@$activated), int(@$l)); + }, + clicked => sub { + require services; + $o->{services} = services::ask($o) and services::doit($o, $o->{services}); + }, + }; + + push @l, { + group => N("Hardware"), + label => N("Keyboard"), + val => sub { $o->{keyboard} && translate(keyboard::keyboard2text($o->{keyboard})) }, + clicked => sub { $o->selectKeyboard(1) }, + }; + + push @l, { + group => N("Hardware"), label => N("Mouse"), val => sub { translate($o->{mouse}{type}) . ' ' . translate($o->{mouse}{name}) }, clicked => sub { selectMouse($o, 1); mouse::write($o->do_pkgs, $o->{mouse}) }, @@ -893,33 +919,6 @@ sub summary { }, } if detect_devices::get_net_interfaces(); - push @l, { - group => N("Boot"), - label => N("Bootloader"), - val => sub { - #-PO: example: lilo-graphic on /dev/hda1 - N("%s on %s", $o->{bootloader}{method}, $o->{bootloader}{boot}); - }, - clicked => sub { - any::setupBootloader($o, $o->{bootloader}, $o->{all_hds}, $o->{fstab}, $o->{security}) or return; - any::installBootloader($o, $o->{bootloader}, $o->{all_hds}); - }, - }; - - push @l, { - group => N("System"), - label => N("Services"), - val => sub { - require services; - my ($l, $activated) = services::services(); - N("Services: %d activated for %d registered", int(@$activated), int(@$l)); - }, - clicked => sub { - require services; - $o->{services} = services::ask($o) and services::doit($o, $o->{services}); - }, - }; - my $check_complete = sub { require install::pkgs; my $p = install::pkgs::packageByName($o->{packages}, 'task-x11'); |