diff options
| -rw-r--r-- | perl-install/Xconfigurator.pm | 2 | ||||
| -rw-r--r-- | perl-install/any.pm | 2 | ||||
| -rw-r--r-- | perl-install/install_any.pm | 2 | ||||
| -rw-r--r-- | perl-install/install_steps.pm | 4 |
4 files changed, 6 insertions, 4 deletions
diff --git a/perl-install/Xconfigurator.pm b/perl-install/Xconfigurator.pm index 4d420af95..e36998931 100644 --- a/perl-install/Xconfigurator.pm +++ b/perl-install/Xconfigurator.pm @@ -404,7 +404,7 @@ NOTE THIS IS EXPERIMENTAL SUPPORT AND MAY FREEZE YOUR COMPUTER.", $xf3_ver)) . " $card->{server} = 'Xpmac'; } - -x "$prefix$card->{prog}" or $in->do_pkgs->install->($card->{use_xf4} ? 'XFree86-server' : "XFree86-$card->{server}", @l); + -x "$prefix$card->{prog}" or $in->do_pkgs->install($card->{use_xf4} ? 'XFree86-server' : "XFree86-$card->{server}", @l); -x "$prefix$card->{prog}" or die "server $card->{server} is not available (should be in $prefix$card->{prog})"; #- check for Matrox G200 PCI cards, disable AGP in such cases, causes black screen else. diff --git a/perl-install/any.pm b/perl-install/any.pm index 3e4fb99a0..7ccfffbd1 100644 --- a/perl-install/any.pm +++ b/perl-install/any.pm @@ -408,7 +408,7 @@ sub pppConfig { symlinkf($modem->{device}, "$prefix/dev/modem") or log::l("creation of $prefix/dev/modem failed") if $modem->{device} ne "/dev/modem"; - $in->do_pkgs->install->('ppp') if !$::testing; + $in->do_pkgs->install('ppp') if !$::testing; my %toreplace; $toreplace{$_} = $modem->{$_} foreach qw(connection phone login passwd auth domain dns1 dns2); diff --git a/perl-install/install_any.pm b/perl-install/install_any.pm index 5babb5bd5..896d535b5 100644 --- a/perl-install/install_any.pm +++ b/perl-install/install_any.pm @@ -966,7 +966,7 @@ use run_program; use common; use pkgs; -sub interactive::do_pkgs { +sub install_steps::do_pkgs { my ($o) = @_; bless { o => $o }, 'interactive_pkgs'; } diff --git a/perl-install/install_steps.pm b/perl-install/install_steps.pm index 00594b950..dcc858015 100644 --- a/perl-install/install_steps.pm +++ b/perl-install/install_steps.pm @@ -835,7 +835,8 @@ sub configureX { { local $::testing = 0; #- unset testing local $::auto = 1; $o->{X}{skiptest} = 1; - Xconfigurator::main($o->{prefix}, $o->{X}, class_discard->new, + local @ISA; push @ISA, 'class_discard'; + Xconfigurator::main($o->{prefix}, $o->{X}, $o, { allowFB => $o->{allowFB}, allowNVIDIA_rpms => install_any::allowNVIDIA_rpms($o->{packages}), }); @@ -964,6 +965,7 @@ sub cleanIfFailedUpgrade($) { } } + #-###################################################################################### #- Wonderful perl :( #-###################################################################################### |