diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 2002-07-28 21:48:32 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 2002-07-28 21:48:32 +0000 |
| commit | 99b93235371e29db8501e4627969b65be559a00c (patch) | |
| tree | ae996cb27bb8f7be2b515b25f64273ea82df3446 | |
| parent | d9a00cca4f2284754cf1bbc8d3fb943bd83fc956 (diff) | |
| download | drakx-backup-do-not-use-99b93235371e29db8501e4627969b65be559a00c.tar drakx-backup-do-not-use-99b93235371e29db8501e4627969b65be559a00c.tar.gz drakx-backup-do-not-use-99b93235371e29db8501e4627969b65be559a00c.tar.bz2 drakx-backup-do-not-use-99b93235371e29db8501e4627969b65be559a00c.tar.xz drakx-backup-do-not-use-99b93235371e29db8501e4627969b65be559a00c.zip | |
(g_auto_install): no need to handle $o->{X} as a special case, it's already done by Xconfig::main::export_to_install_X
| -rw-r--r-- | perl-install/install_any.pm | 11 |
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; |