simplify and factorize

(now works on 1.upgrade 2.install 3.install + change existing config)

1 files changed, 6 insertions, 11 deletions

diff --git a/perl-install/install_steps_interactive.pm b/perl-install/install_steps_interactive.pm
index d4f70adc2..dd26fce10 100644
--- a/perl-install/install_steps_interactive.pm
+++ b/perl-install/install_steps_interactive.pm
@@ -1111,22 +1111,17 @@ sub miscellaneous {
 sub configureX {
     my ($o, $expert) = @_;
 
+    install_steps::configureXBefore($o);
+    symlink "$o->{prefix}/etc/gtk", "/etc/gtk";
+
     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;
-	}
+    require Xconfig::main;
+    if ($o->{raw_X} = Xconfig::main::configure_everything_or_configure_chooser($o, $options, !$expert, $o->{keyboard}, $o->{mouse})) {
+	install_steps::configureXAfter($o);
     }
 }