really use a class_discard for Xconfigurator::main

4 files changed, 8 insertions, 8 deletions

diff --git a/perl-install/Xconfigurator.pm b/perl-install/Xconfigurator.pm
index e36998931..c34f4e221 100644
--- a/perl-install/Xconfigurator.pm
+++ b/perl-install/Xconfigurator.pm
@@ -2,7 +2,7 @@ package Xconfigurator; # $Id$
 
 use diagnostics;
 use strict;
-use vars qw($in @window_managers @depths @monitorSize2resolution @hsyncranges %min_hsync4wres @vsyncranges %depths @resolutions @resolutions_laptop %serversdriver @svgaservers @accelservers @allbutfbservers @allservers %vgamodes %videomemory @ramdac_name @ramdac_id @clockchip_name @clockchip_id %keymap_translate %standard_monitors $XF86firstchunk_text $keyboardsection_start $keyboardsection_start_v4 $keyboardsection_part2 $keyboardsection_part3 $keyboardsection_part3_v4 $keyboardsection_end $pointersection_text $monitorsection_text1 $monitorsection_text2 $monitorsection_text3 $monitorsection_text4 $modelines_text_Trident_TG_96xx $modelines_text_ext $modelines_text $devicesection_text $devicesection_text_v4 $screensection_text1 %lines @options %xkb_options $good_default_monitor $low_default_monitor $layoutsection_v4 $modelines_text_apple);
+use vars qw($in $do_pkgs @window_managers @depths @monitorSize2resolution @hsyncranges %min_hsync4wres @vsyncranges %depths @resolutions @resolutions_laptop %serversdriver @svgaservers @accelservers @allbutfbservers @allservers %vgamodes %videomemory @ramdac_name @ramdac_id @clockchip_name @clockchip_id %keymap_translate %standard_monitors $XF86firstchunk_text $keyboardsection_start $keyboardsection_start_v4 $keyboardsection_part2 $keyboardsection_part3 $keyboardsection_part3_v4 $keyboardsection_end $pointersection_text $monitorsection_text1 $monitorsection_text2 $monitorsection_text3 $monitorsection_text4 $modelines_text_Trident_TG_96xx $modelines_text_ext $modelines_text $devicesection_text $devicesection_text_v4 $screensection_text1 %lines @options %xkb_options $good_default_monitor $low_default_monitor $layoutsection_v4 $modelines_text_apple);
 
 use common;
 use log;
@@ -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 $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.
@@ -1377,7 +1377,7 @@ sub show_info {
 
 #- Program entry point.
 sub main {
-    ($prefix, my $o, $in, my $cardOptions) = @_;
+    ($prefix, my $o, $in, $do_pkgs, my $cardOptions) = @_;
     $o ||= {};
 
     XF86check_link('');
diff --git a/perl-install/install_steps.pm b/perl-install/install_steps.pm
index 12709e297..5b8bf3ffd 100644
--- a/perl-install/install_steps.pm
+++ b/perl-install/install_steps.pm
@@ -835,8 +835,7 @@ sub configureX {
     { local $::testing = 0; #- unset testing
       local $::auto = 1;
       $o->{X}{skiptest} = 1;
-      local @ISA; push @ISA, 'class_discard';
-      Xconfigurator::main($o->{prefix}, $o->{X}, $o,
+      Xconfigurator::main($o->{prefix}, $o->{X}, class_discard->new, $o->do_pkgs,
 			  { allowFB          => $o->{allowFB},
 			    allowNVIDIA_rpms => install_any::allowNVIDIA_rpms($o->{packages}),
 			  });
diff --git a/perl-install/install_steps_interactive.pm b/perl-install/install_steps_interactive.pm
index bc33ad6e8..6b2a96ecd 100644
--- a/perl-install/install_steps_interactive.pm
+++ b/perl-install/install_steps_interactive.pm
@@ -1125,7 +1125,7 @@ sub configureX {
       local $::auto = !$::expert && !$clicked;
 
       symlink "$o->{prefix}/etc/gtk", "/etc/gtk";
-      Xconfigurator::main($o->{prefix}, $o->{X}, $o,
+      Xconfigurator::main($o->{prefix}, $o->{X}, $o, $o->do_pkgs,
 			  { allowFB          => $o->{allowFB},
 			    allowNVIDIA_rpms => install_any::allowNVIDIA_rpms($o->{packages}),
 			  });
diff --git a/perl-install/standalone/XFdrake b/perl-install/standalone/XFdrake
index 3373821fb..b76be2162 100755
--- a/perl-install/standalone/XFdrake
+++ b/perl-install/standalone/XFdrake
@@ -81,8 +81,9 @@ eval {
 };
 
 $::isEmbedded and kill USR2, $::CCPID;
-Xconfigurator::main('', $i, $in, { allowFB          => $::expert,
-				   allowNVIDIA_rpms => $allowNVIDIA_rpms });
+Xconfigurator::main('', $i, $in, $in->do_pkgs, 
+		    { allowFB          => $::expert,
+		      allowNVIDIA_rpms => $allowNVIDIA_rpms });
 !$::isEmbedded and $in->exit(0);
 kill USR1, $::CCPID;
 goto begin;