summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2005-08-30 11:56:30 +0000
committerPascal Rigaux <pixel@mandriva.com>2005-08-30 11:56:30 +0000
commita412fe342782661f8656c0ddba7b9c19b2ad0bd1 (patch)
tree74f2f24e65953d14473870aefea0e472aae1bfc8
parent9f9b415838f308491eeecb8193ca6af8bb67cbff (diff)
downloaddrakx-backup-do-not-use-a412fe342782661f8656c0ddba7b9c19b2ad0bd1.tar
drakx-backup-do-not-use-a412fe342782661f8656c0ddba7b9c19b2ad0bd1.tar.gz
drakx-backup-do-not-use-a412fe342782661f8656c0ddba7b9c19b2ad0bd1.tar.bz2
drakx-backup-do-not-use-a412fe342782661f8656c0ddba7b9c19b2ad0bd1.tar.xz
drakx-backup-do-not-use-a412fe342782661f8656c0ddba7b9c19b2ad0bd1.zip
vga_fb expects the vga mode, not a boolean, fixing
-rwxr-xr-xperl-install/standalone/drakboot2
1 files changed, 1 insertions, 1 deletions
diff --git a/perl-install/standalone/drakboot b/perl-install/standalone/drakboot
index c26992258..dfa8f306a 100755
--- a/perl-install/standalone/drakboot
+++ b/perl-install/standalone/drakboot
@@ -48,7 +48,7 @@ my $bootloader = bootloader::read($all_hds);
if (!$bootloader) {
$in->ask_okcancel('', N("No bootloader found, creating a new configuration"), 0) or $in->exit;
bootloader::suggest($bootloader ||= {}, $all_hds,
- vga_fb => listlength(cat_("/proc/fb")),
+ vga_fb => first($cmdline =~ /\bvga=(\S+)/), #- don't use $1 here, otherwise perl will hit you because of the other "=~" below
quiet => $cmdline =~ /\bsplash=silent\b/,
);
}