summaryrefslogtreecommitdiffstats
path: root/perl-install
diff options
context:
space:
mode:
authorThierry Vignaud <thierry.vignaud@gmail.com>2015-03-17 22:11:23 +0100
committerThierry Vignaud <thierry.vignaud@gmail.com>2015-03-17 22:12:31 +0100
commit1405b78caafa724dfba2d9d56c16088bf7e0fb50 (patch)
tree6d92ddf5eee5e10dee916327ebb83533d2a73612 /perl-install
parent79ddf1c3b4730b93c664bca3176fbb7f140d3e71 (diff)
downloaddrakx-1405b78caafa724dfba2d9d56c16088bf7e0fb50.tar
drakx-1405b78caafa724dfba2d9d56c16088bf7e0fb50.tar.gz
drakx-1405b78caafa724dfba2d9d56c16088bf7e0fb50.tar.bz2
drakx-1405b78caafa724dfba2d9d56c16088bf7e0fb50.tar.xz
drakx-1405b78caafa724dfba2d9d56c16088bf7e0fb50.zip
log mkinitrd faillures (mga#9201)
Diffstat (limited to 'perl-install')
-rw-r--r--perl-install/NEWS2
-rw-r--r--perl-install/bootloader.pm7
-rw-r--r--perl-install/install/NEWS1
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