diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 2008-03-27 08:22:23 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 2008-03-27 08:22:23 +0000 |
| commit | 360dabe91b296b09b62d0a1d82d4e536dc9d4d45 (patch) | |
| tree | 910392b4b97321502a137dbf06799b6a4ce84fff | |
| parent | cb6285a37920da3efcfbaaedb7040910f5bd6f48 (diff) | |
| download | drakx-360dabe91b296b09b62d0a1d82d4e536dc9d4d45.tar drakx-360dabe91b296b09b62d0a1d82d4e536dc9d4d45.tar.gz drakx-360dabe91b296b09b62d0a1d82d4e536dc9d4d45.tar.bz2 drakx-360dabe91b296b09b62d0a1d82d4e536dc9d4d45.tar.xz drakx-360dabe91b296b09b62d0a1d82d4e536dc9d4d45.zip | |
- draksplash:
o fix reading grub conf (#39346)
also ensure we don't break $grub2dev when we're not given a valid $fstab
| -rw-r--r-- | perl-install/NEWS | 2 | ||||
| -rw-r--r-- | perl-install/bootloader.pm | 3 | ||||
| -rw-r--r-- | perl-install/bootsplash.pm | 4 |
3 files changed, 7 insertions, 2 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS index 76a11c7f2..62e3819d0 100644 --- a/perl-install/NEWS +++ b/perl-install/NEWS @@ -2,6 +2,8 @@ o allow "Use free space" if there is an extended partition even if all primary partitions are used (#38804) (*old* bug!) +- draksplash: + o fix reading grub conf (#39346) Version 10.20 - 25 March 2008 diff --git a/perl-install/bootloader.pm b/perl-install/bootloader.pm index adca7a9d3..c35f5aad2 100644 --- a/perl-install/bootloader.pm +++ b/perl-install/bootloader.pm @@ -223,7 +223,8 @@ sub read_grub { sub _may_fix_grub2dev { my ($fstab, $grub2dev, $root) = @_; - my $real_root_part = fs::get::root($fstab); + my $real_root_part = fs::get::root_($fstab) or + log::l("argh... the fstab given is useless, it doesn't contain '/'"), return; if (my $prev_root_part = fs::get::device2part(grub2dev($root, $grub2dev), $fstab)) { # the root_device as far as grub config files say $real_root_part == $prev_root_part and return; diff --git a/perl-install/bootsplash.pm b/perl-install/bootsplash.pm index 6507e46ef..ef89fc330 100644 --- a/perl-install/bootsplash.pm +++ b/perl-install/bootsplash.pm @@ -15,7 +15,9 @@ our @resolutions = uniq(map { "$_->{X}x$_->{Y}" } Xconfig::resolution_and_depth: sub get_framebuffer_resolution() { require bootloader; require fsedit; - my $bootloader = bootloader::read(fsedit::get_hds()); + my $all_hds = fsedit::get_hds(); + fs::get_info_from_fstab($all_hds); + my $bootloader = bootloader::read($all_hds); my $x_res = Xconfig::resolution_and_depth::from_bios($bootloader->{default_options}{vga}); $x_res ? ($x_res->{X} . 'x' . $x_res->{Y}, 1) : |