summaryrefslogtreecommitdiffstats
path: root/perl-install
diff options
context:
space:
mode:
authorFrancois Pons <fpons@mandriva.com>2001-09-05 13:43:01 +0000
committerFrancois Pons <fpons@mandriva.com>2001-09-05 13:43:01 +0000
commit41c9cb38de38428a2a01657f04d0dfbd1a280e83 (patch)
treea5329abd6ad004c210f5d091e53716d508eb7304 /perl-install
parent4fc40ba8280005a3337e4cd245dc18c0aab28404 (diff)
downloaddrakx-41c9cb38de38428a2a01657f04d0dfbd1a280e83.tar
drakx-41c9cb38de38428a2a01657f04d0dfbd1a280e83.tar.gz
drakx-41c9cb38de38428a2a01657f04d0dfbd1a280e83.tar.bz2
drakx-41c9cb38de38428a2a01657f04d0dfbd1a280e83.tar.xz
drakx-41c9cb38de38428a2a01657f04d0dfbd1a280e83.zip
filtering $o->{printer} for g_auto_install().
Diffstat (limited to 'perl-install')
-rw-r--r--perl-install/install_any.pm12
1 files changed, 11 insertions, 1 deletions
diff --git a/perl-install/install_any.pm b/perl-install/install_any.pm
index ea37a7123..84c6214b7 100644
--- a/perl-install/install_any.pm
+++ b/perl-install/install_any.pm
@@ -644,7 +644,17 @@ 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 printer 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 wacom netc timezone superuser intf keyboard users partitioning isUpgrade manualFstab nomouseprobe crypto security netcnx useSupermount autoExitInstall mkbootdisk); #- TODO modules bootloader
+
+ if (my $printer = $::o->{printer}) {
+ $o->{printer}{$_} = $::o->{printer}{$_} foreach qw(SPOOLER TYPE str_type OPTIONS DBENTRY);
+ $o->{printer}{configured} = {};
+ foreach my $queue (keys %{$::o->{printer}{configured}}) {
+ my $val = $::o->{printer}{configured}{$queue};
+ $val->{$_} and $o->{printer}{configured}{$queue}{$_} = $val->{$_} foreach qw(OPTIONS);
+ add2hash($o->{printer}{configured}{$queue}{queuedata} = {}, $val->{queuedata});
+ }
+ }
if (my $card = $::o->{X}{card}) {
$o->{X}{$_} = $::o->{X}{$_} foreach qw(default_depth resolution_wanted);