summaryrefslogtreecommitdiffstats
path: root/perl-install/install_steps_interactive.pm
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2003-01-07 20:23:51 +0000
committerPascal Rigaux <pixel@mandriva.com>2003-01-07 20:23:51 +0000
commit4aaa5ac7b90f200169d1d8392e52d0121918702d (patch)
tree7fc8f88fcb82e44057440cb09fcd486fea087b32 /perl-install/install_steps_interactive.pm
parent2998b750f576457a29b69b462a9c224a06c96d3c (diff)
downloaddrakx-backup-do-not-use-4aaa5ac7b90f200169d1d8392e52d0121918702d.tar
drakx-backup-do-not-use-4aaa5ac7b90f200169d1d8392e52d0121918702d.tar.gz
drakx-backup-do-not-use-4aaa5ac7b90f200169d1d8392e52d0121918702d.tar.bz2
drakx-backup-do-not-use-4aaa5ac7b90f200169d1d8392e52d0121918702d.tar.xz
drakx-backup-do-not-use-4aaa5ac7b90f200169d1d8392e52d0121918702d.zip
(summary): add X configuration
(configureX): this step is now always automatic. don't call configureXAfter() when config failed
Diffstat (limited to 'perl-install/install_steps_interactive.pm')
-rw-r--r--perl-install/install_steps_interactive.pm30
1 files changed, 20 insertions, 10 deletions
diff --git a/perl-install/install_steps_interactive.pm b/perl-install/install_steps_interactive.pm
index dbd808969..97bca2f95 100644
--- a/perl-install/install_steps_interactive.pm
+++ b/perl-install/install_steps_interactive.pm
@@ -851,6 +851,7 @@ sub summary {
{ label => N("Timezone"), val => \$o->{timezone}{timezone}, clicked => sub { $o->configureTimezone(1) } },
{ label => N("Printer"), val => \$o->{printer}, clicked => sub { $o->configurePrinter(1) }, format => $format_printers },
{ label => N("Bootloader"), val => \$o->{bootloader}, clicked => sub { any::setupBootloader($o, $o->{bootloader}, $o->{all_hds}, $o->{fstab}, $o->{security}) }, format => sub { "$o->{bootloader}{method} on $o->{bootloader}{boot}" } },
+{ label => N("Graphical interface"), val => \$o->{raw_X}, clicked => sub { configureX($o, 'expert') }, format => sub { $o->{raw_X} ? Xconfig::resolution_and_depth::to_string($o->{raw_X}->get_resolution) : '' } },
(map {
{ label => N("ISDN card"), val => $_->{description}, clicked => sub { $o->configureNetwork } }
} grep { $_->{driver} eq 'hisax' } detect_devices::probeall()),
@@ -1107,16 +1108,25 @@ sub miscellaneous {
#------------------------------------------------------------------------------
sub configureX {
- my ($o, $clicked) = @_;
- $o->configureXBefore;
-
- symlink "$o->{prefix}/etc/gtk", "/etc/gtk";
- require Xconfig::main;
- Xconfig::main::configure_everything($o, $o->{raw_X}, $o->do_pkgs, !$::expert && !$clicked,
- { allowFB => $o->{allowFB},
- allowNVIDIA_rpms => install_any::allowNVIDIA_rpms($o->{packages}),
- });
- $o->configureXAfter;
+ my ($o, $expert) = @_;
+
+ my $options = {
+ allowFB => $o->{allowFB},
+ allowNVIDIA_rpms => install_any::allowNVIDIA_rpms($o->{packages}),
+ };
+
+ if ($o->{raw_X}) {
+ Xconfig::main::configure_chooser($o, $o->{raw_X}, $o->do_pkgs, $options);
+ } else {
+ install_steps::configureXBefore($o);
+ symlink "$o->{prefix}/etc/gtk", "/etc/gtk";
+ require Xconfig::main;
+ if (Xconfig::main::configure_everything($o, $o->{raw_X}, $o->do_pkgs, !$expert, $options)) {
+ install_steps::configureXAfter($o);
+ } else {
+ $o->{raw_X} = undef;
+ }
+ }
}
#------------------------------------------------------------------------------