(g_auto_install): no need to handle $o->{X} as a special case, it's already done by Xconfig::main::export_to_install_X

1 files changed, 1 insertions, 10 deletions

diff --git a/perl-install/install_any.pm b/perl-install/install_any.pm
index 34d4e9b0c..c1bfc3988 100644
--- a/perl-install/install_any.pm
+++ b/perl-install/install_any.pm
@@ -693,7 +693,7 @@ sub g_auto_install {
     my @fields = qw(mntpoint type size);
     $o->{partitions} = [ map { my %l; @l{@fields} = @$_{@fields}; \%l } grep { $_->{mntpoint} } @{$::o->{fstab}} ];
     
-    exists $::o->{$_} and $o->{$_} = $::o->{$_} foreach qw(lang authentication mouse wacom netc timezone superuser intf keyboard users partitioning isUpgrade manualFstab nomouseprobe crypto security netcnx useSupermount autoExitInstall mkbootdisk); #- TODO modules bootloader 
+    exists $::o->{$_} and $o->{$_} = $::o->{$_} foreach qw(lang authentication mouse netc timezone superuser intf keyboard users partitioning isUpgrade manualFstab nomouseprobe crypto security netcnx useSupermount autoExitInstall mkbootdisk X); #- TODO modules bootloader 
 
     if (my $printer = $::o->{printer}) {
 	$o->{printer}{$_} = $::o->{printer}{$_} foreach qw(SPOOLER DEFAULT BROWSEPOLLADDR BROWSEPOLLPORT MANUALCUPSCONFIG);
@@ -704,15 +704,6 @@ sub g_auto_install {
 	}
     }
 
-    if (my $card = $::o->{X}{card}) {
-	$o->{X}{$_} = $::o->{X}{$_} foreach qw(default_depth resolution_wanted);
-	if ($o->{X}{default_depth} and my $depth = $card->{depth}{$o->{X}{default_depth}}) {
-	    $depth ||= [];
-	    $o->{X}{resolution_wanted} ||= join "x", @{$depth->[0]} unless is_empty_array_ref($depth->[0]);
-	    $o->{X}{monitor} = $::o->{X}{monitor} if $::o->{X}{monitor}{manual};
-	}
-    }
-
     local $o->{partitioning}{auto_allocate} = !$replay;
     $o->{autoExitInstall} = !$replay;
     $o->{interactiveSteps} = [ 'doPartitionDisks', 'formatPartitions'] if $replay;