diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 2002-07-25 15:25:50 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 2002-07-25 15:25:50 +0000 |
| commit | 830c414dd3c6eb3e3371e7306412d181b6cf2408 (patch) | |
| tree | f02bf724493d6e9f9eb5ca19f4d7108ee01aec83 | |
| parent | 29a617a0385e327a329a8cf20b6778f487de7115 (diff) | |
| download | drakx-backup-do-not-use-830c414dd3c6eb3e3371e7306412d181b6cf2408.tar drakx-backup-do-not-use-830c414dd3c6eb3e3371e7306412d181b6cf2408.tar.gz drakx-backup-do-not-use-830c414dd3c6eb3e3371e7306412d181b6cf2408.tar.bz2 drakx-backup-do-not-use-830c414dd3c6eb3e3371e7306412d181b6cf2408.tar.xz drakx-backup-do-not-use-830c414dd3c6eb3e3371e7306412d181b6cf2408.zip | |
let the bootloader::mkinitrd error be seen by the GUI
| -rw-r--r-- | perl-install/bootloader.pm | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/perl-install/bootloader.pm b/perl-install/bootloader.pm index a0b18f69a..30ad4ea4d 100644 --- a/perl-install/bootloader.pm +++ b/perl-install/bootloader.pm @@ -168,7 +168,7 @@ sub add_kernel { -e "$prefix/boot/vmlinuz-$version" or log::l("unable to find kernel image $prefix/boot/vmlinuz-$version"), return; my $image = "/boot/vmlinuz" . ($ext ne "-$version" && symlinkf("vmlinuz-$version", "$prefix/boot/vmlinuz$ext") ? $ext : "-$version"); - my $initrd = eval { + my $initrd = do { mkinitrd($prefix, $version, "/boot/initrd-$version.img"); "/boot/initrd" . ($ext ne "-$version" && symlinkf("initrd-$version.img", "$prefix/boot/initrd$ext.img") ? $ext : "-$version") . ".img"; @@ -241,10 +241,7 @@ sub configure_entry($$) { if ($specific_version) { $entry->{initrd} or $entry->{initrd} = "/boot/initrd-$specific_version.img"; - if (! -e "$prefix/$entry->{initrd}" || $::oem) { - eval { mkinitrd($prefix, $specific_version, "$entry->{initrd}") }; - undef $entry->{initrd} if $@; - } + mkinitrd($prefix, $specific_version, $entry->{initrd}); } } $entry; |