summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--perl-install/Xconfig.pm11
-rw-r--r--perl-install/install_any.pm11
-rw-r--r--perl-install/install_steps.pm2
3 files changed, 14 insertions, 10 deletions
diff --git a/perl-install/Xconfig.pm b/perl-install/Xconfig.pm
index 71a75cc67..8e31ed4af 100644
--- a/perl-install/Xconfig.pm
+++ b/perl-install/Xconfig.pm
@@ -77,26 +77,25 @@ sub getinfoFromXF86Config {
} elsif (my $s = /^Section "Screen"/ .. /^EndSection/) {
undef $driver if $s == 1;
$driver = $1 if /^\s*Driver\s+"(.*?)"/;
- #- print "($driver eq $Xconfigurator::serversdriver{$o->{card}{server}})";
- if ($driver eq $Xconfigurator::serversdriver{$o->{card}{server}}) { #- take into account the right screen section for the server.
+ if ($driver eq $Xconfigurator::serversdriver{$o->{card}{server}}) {
$o->{card}{default_depth} ||= $1 if /^\s*DefaultColorDepth\s+(\d+)/;
if (my $i = /^\s*Subsection\s+"Display"/ .. /^\s*EndSubsection/) {
undef $depth if $i == 1;
$depth = $1 if /^\s*Depth\s+(\d*)/;
if (/^\s*Modes\s+(.*)/) {
my $a = 0;
- push @{$o->{card}{depth}{$depth || 8}},
+ unshift @{$o->{card}{depth}{$depth || 8} ||= []}, #- insert at the beginning for resolution_wanted!
grep { $_->[0] >= 640 } map { [ /"(\d+)x(\d+)"/ ] } split ' ', $1;
}
}
}
}
}
- #- get the default resolution.
+ #- get the default resolution according the the current file.
my @depth = keys %{$o->{card}{depth}};
$o->{resolution_wanted} ||=
- $o->{card}{depth}{$o->{card}{default_depth} || $depth[0]}[0][0] . "x" .
- $o->{card}{depth}{$o->{card}{default_depth} || $depth[0]}[0][1];
+ ($o->{card}{depth}{$o->{card}{default_depth} || $depth[0]}[0][0]) . "x" .
+ ($o->{card}{depth}{$o->{card}{default_depth} || $depth[0]}[0][1]);
$o;
}
diff --git a/perl-install/install_any.pm b/perl-install/install_any.pm
index 8e029aa65..8ab9d4073 100644
--- a/perl-install/install_any.pm
+++ b/perl-install/install_any.pm
@@ -394,9 +394,14 @@ sub setupFB {
#- with the right mode, nothing more to do.
foreach (qw(secure smp)) {
if ($o->{bootloader}{entries}{"/boot/vmlinuz-$_"}) {
- $o->{bootloader}{entries}{"/boot/vmlinuz-$_"}{vga} = $vga;
- lilo::install($o->{prefix}, $o->{bootloader});
- return 1;
+ if ($_ eq 'secure') {
+ log::l("warning: kernel-secure is not fb, using a kernel-fb instead");
+ #- nothing done, fall through linux-fb.
+ } else {
+ $o->{bootloader}{entries}{"/boot/vmlinuz-$_"}{vga} = $vga;
+ lilo::install($o->{prefix}, $o->{bootloader});
+ return 1;
+ }
}
}
my $root = $o->{bootloader}{entries}{'/boot/vmlinuz'}{root};
diff --git a/perl-install/install_steps.pm b/perl-install/install_steps.pm
index cbb3ce38e..fac5d21f6 100644
--- a/perl-install/install_steps.pm
+++ b/perl-install/install_steps.pm
@@ -234,7 +234,7 @@ sub installPackages($$) {
}
#- hack to ensure proper ordering for installation of packages.
- my @firstToInstall = qw(setup basesystem sed);
+ my @firstToInstall = qw(setup basesystem chkconfig sed);
my %firstInstalled;
my @toInstall;
foreach (@firstToInstall) {