summaryrefslogtreecommitdiffstats
path: root/perl-install
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mageia.org>2012-08-07 10:37:22 +0000
committerThierry Vignaud <tv@mageia.org>2012-08-07 10:37:22 +0000
commita7f8603a093351bd8b4e426127d9e61cbda72fb5 (patch)
tree40ac80f484f1b08b113cc659066903e18aab7b2e /perl-install
parentdbe6f150996e9c822f3db45ff84c621d8cdbb178 (diff)
downloaddrakx-backup-do-not-use-a7f8603a093351bd8b4e426127d9e61cbda72fb5.tar
drakx-backup-do-not-use-a7f8603a093351bd8b4e426127d9e61cbda72fb5.tar.gz
drakx-backup-do-not-use-a7f8603a093351bd8b4e426127d9e61cbda72fb5.tar.bz2
drakx-backup-do-not-use-a7f8603a093351bd8b4e426127d9e61cbda72fb5.tar.xz
drakx-backup-do-not-use-a7f8603a093351bd8b4e426127d9e61cbda72fb5.zip
(mkinitrd) do not crash if a foreign partition is not mounted (mga#6966)
Diffstat (limited to 'perl-install')
-rw-r--r--perl-install/bootloader.pm4
1 files changed, 3 insertions, 1 deletions
diff --git a/perl-install/bootloader.pm b/perl-install/bootloader.pm
index fedb4a15e..62a046fe9 100644
--- a/perl-install/bootloader.pm
+++ b/perl-install/bootloader.pm
@@ -109,9 +109,11 @@ sub get_label {
sub mkinitrd {
my ($kernel_version, $bootloader, $entry, $initrd) = @_;
+ my $dir = dirname($initrd);
return $initrd if $::testing # testing mode
|| -e "$::prefix/$initrd" # already exists
- || $initrd =~ /\(hd/; # unrecognized partition
+ || $initrd =~ /\(hd/ # unrecognized partition
+ || !-d $dir; # dir doesn't exist (probably !mounted foreign part)
# for /boot on dos partitions when installing on loopback file on dos partition
my $loop_boot = fs::loopback::prepare_boot();