diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 2007-11-26 11:56:34 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 2007-11-26 11:56:34 +0000 |
| commit | 21faaaeedcf6554ae72e47ce58df2a680197dc1c (patch) | |
| tree | 228e3b54766121097272c616cc8378fa7e930fd9 | |
| parent | 829e08798af0110f8a571acd73c219ad79f24666 (diff) | |
| download | drakx-21faaaeedcf6554ae72e47ce58df2a680197dc1c.tar drakx-21faaaeedcf6554ae72e47ce58df2a680197dc1c.tar.gz drakx-21faaaeedcf6554ae72e47ce58df2a680197dc1c.tar.bz2 drakx-21faaaeedcf6554ae72e47ce58df2a680197dc1c.tar.xz drakx-21faaaeedcf6554ae72e47ce58df2a680197dc1c.zip | |
- bootloader:
o when reading existing menu.lst, keep verbatim entries for which the device
has no mount-point
| -rw-r--r-- | perl-install/NEWS | 3 | ||||
| -rw-r--r-- | perl-install/bootloader.pm | 4 |
2 files changed, 5 insertions, 2 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS index 48ab8933b..1f9b3ce2f 100644 --- a/perl-install/NEWS +++ b/perl-install/NEWS @@ -1,3 +1,6 @@ +- bootloader: + o when reading existing menu.lst, keep verbatim entries for which the device + has no mount-point - diskdrake: o fix garbaged error messages when umounting fs o disallow "Use for loopback" when the partition used for loopback is diff --git a/perl-install/bootloader.pm b/perl-install/bootloader.pm index 13959c369..ba69f00e9 100644 --- a/perl-install/bootloader.pm +++ b/perl-install/bootloader.pm @@ -1495,8 +1495,8 @@ sub grub2dev { sub grub2file { my ($grub_file, $grub2dev, $fstab) = @_; if (my ($device, $rel_file) = grub2dev_and_file($grub_file, $grub2dev)) { - if (my $part = fs::get::device2part($device, $fstab)) { - my $mntpoint = $part->{mntpoint} || ''; + my $part = fs::get::device2part($device, $fstab); + if (my $mntpoint = $part && $part->{mntpoint}) { ($mntpoint eq '/' ? '' : $mntpoint) . '/' . $rel_file; } else { log::l("ERROR: unknown device $device (computed from $grub_file)"); |