From 1405b78caafa724dfba2d9d56c16088bf7e0fb50 Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Tue, 17 Mar 2015 22:11:23 +0100 Subject: log mkinitrd faillures (mga#9201) --- perl-install/NEWS | 2 ++ perl-install/bootloader.pm | 7 +++++-- perl-install/install/NEWS | 1 + 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/perl-install/NEWS b/perl-install/NEWS index d824fb4ba..caf0b880a 100644 --- a/perl-install/NEWS +++ b/perl-install/NEWS @@ -1,3 +1,5 @@ +- drakboot: + o log mkinitrd faillures (mga#9201) - fix mis-detecting some mobile broadband modems (mga#12492) Version 16.66 - 5 March 2015 diff --git a/perl-install/bootloader.pm b/perl-install/bootloader.pm index 1c78bd628..0ee49b862 100644 --- a/perl-install/bootloader.pm +++ b/perl-install/bootloader.pm @@ -155,9 +155,12 @@ sub mkinitrd { if_($::isInstall, "-v"), "-f", $initrd, $kernel_version, if_($entry->{initrd_options}, split(' ', $entry->{initrd_options})), ); - if (!run_program::rooted($::prefix, 'mkinitrd', @options)) { + + my $err; + if (!run_program::rooted($::prefix, 'mkinitrd', '2>', \$err, @options)) { unlink("$::prefix/$initrd"); - die "mkinitrd failed:\n(mkinitrd @options)"; + log::explanations("mkinitrd failed:\n(mkinitrd @options)\nError: <$err>"); + die "mkinitrd failed:\n(mkinitrd @options)\nError: $err"; } add_boot_splash($initrd, $entry->{vga} || $bootloader->{vga}); diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS index 681c4d833..963e43c9b 100644 --- a/perl-install/install/NEWS +++ b/perl-install/install/NEWS @@ -1,5 +1,6 @@ - fix mis-detecting some mobile broadband modems (mga#12492) - add 'deploops' option for debugging (mga#15350) +- log mkinitrd faillures (mga#9201) Version 16.67 - 5 March 2015 -- cgit v1.2.1