fixed frame buffer usage if not enabled (installation of Aurora)

clean up and remove unused code.

2 files changed, 9 insertions, 23 deletions

diff --git a/perl-install/install_any.pm b/perl-install/install_any.pm
index 50af69584..b8ea543b4 100644
--- a/perl-install/install_any.pm
+++ b/perl-install/install_any.pm
@@ -117,6 +117,7 @@ sub errorOpeningFile($) {
 }
 sub getFile {
     my ($f, $method) = @_;
+    log::l("getFile $f:$method");
     my $rel = relGetFile($f);
     do {
 	if ($method =~ /crypto/i) {
@@ -292,13 +293,8 @@ sub setPackages {
 	push @{$o->{default_packages}}, "alsa", "alsa-utils" if modules::get_alias("snd-slot-0") =~ /^snd-card-/;
 
 	pkgs::getDeps($o->{prefix}, $o->{packages});
-	pkgs::selectPackage($o->{packages}, pkgs::packageByName($o->{packages}, 'basesystem') || die("missing basesystem package"), 1);
-
-#	 #- some program that may be crazy on some conditions (hack waiting for Aurora to work if no fb).
-#	 $o->{allowFB} && (!detect_devices::matching_desc('Rage LT') &&
-#			   !detect_devices::matching_desc('SiS') &&
-#			   !detect_devices::matching_desc('Rage Mobility'))
-#	   or push @pkgs::skip_list (*deprecated*), 'Aurora';
+	pkgs::selectPackage($o->{packages},
+			    pkgs::packageByName($o->{packages}, 'basesystem') || die("missing basesystem package"), 1);
 
 	#- must be done after selecting base packages (to save memory)
 	pkgs::getProvides($o->{packages});
@@ -319,18 +315,6 @@ sub setPackages {
 	    $o->{compssUsersChoice}{qq(LOCALES"$_")} = 1;
 	}
  
-#	 if (detect_devices::matching_desc('Matrox.* G[24]00') ||
-#	     detect_devices::matching_desc('Riva.*128') ||
-#	     detect_devices::matching_desc('Rage X[CL]') ||
-#	     detect_devices::matching_desc('Rage Mobility (?:P\/M|L) ') ||
-#	     detect_devices::matching_desc('3D Rage (?:LT|Pro)') ||
-#	     detect_devices::matching_desc('Voodoo [35]') ||
-#	     detect_devices::matching_desc('Voodoo Banshee') ||
-#	     detect_devices::matching_desc('8281[05].* CGC') ||
-#	     detect_devices::matching_desc('Radeon ') ||
-#	     detect_devices::matching_desc('Rage 128')) {
-#	}
-
 	#- for the first time, select package to upgrade.
 	#- TOCHECK this may not be the best place for that as package are selected at some other point.
 	$o->selectPackagesToUpgrade if $o->{isUpgrade};
@@ -338,9 +322,6 @@ sub setPackages {
 	#- this has to be done to make sure necessary files for urpmi are
 	#- present.
 	pkgs::psUpdateHdlistsDeps($o->{prefix}, $o->{method});
-
-	#- remove upgrade flag with selection one. TOCHECK
-	#pkgs::unselectAllPackagesIncludingUpgradable($o->{packages});
     }
 }
 
diff --git a/perl-install/install_steps.pm b/perl-install/install_steps.pm
index 4a7d57997..f104ca885 100644
--- a/perl-install/install_steps.pm
+++ b/perl-install/install_steps.pm
@@ -649,10 +649,15 @@ sub setupBootloaderBefore {
 	    $o->{bootloader}{part_nb} ||= first($dev->{device} =~ /(\d+)/);
 	}
     } else {
+	#- check for valid fb mode to enable a default boot with frame buffer.
+	my $vga = $o->{allowFB} && (!detect_devices::matching_desc('Rage LT') &&
+				    !detect_devices::matching_desc('SiS') &&
+				    !detect_devices::matching_desc('Rage Mobility')) && $o->{vga};
+
 	require bootloader;
 	#- propose the default fb mode for kernel fb, if aurora is installed too.
         bootloader::suggest($o->{prefix}, $o->{bootloader}, $o->{hds}, $o->{fstab}, install_any::kernelVersion($o),
-			    pkgs::packageFlagInstalled(pkgs::packageByName($o->{packages}, 'Aurora') || {}) && ($o->{vga} || 785));
+			    pkgs::packageFlagInstalled(pkgs::packageByName($o->{packages}, 'Aurora') || {}) && $vga);
 	if ($o->{miscellaneous}{profiles}) {
 	    my $e = bootloader::get_label("linux", $o->{bootloader});
 	    push @{$o->{bootloader}{entries}}, { %$e, label => "office", append => "$e->{append} prof=Office" };