summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEugeni Dodonov <eugeni@mandriva.org>2011-05-10 18:23:57 +0000
committerEugeni Dodonov <eugeni@mandriva.org>2011-05-10 18:23:57 +0000
commitad64ed5bbe42c433aa7900c97b5aa13b6aa2539d (patch)
tree492a1d51186ad988e571499e8ad58f3cc4868bb1
parent4b2090efbe98dc13f546c749b5f1204e1c5d07b4 (diff)
downloaddrakx-backup-do-not-use-ad64ed5bbe42c433aa7900c97b5aa13b6aa2539d.tar
drakx-backup-do-not-use-ad64ed5bbe42c433aa7900c97b5aa13b6aa2539d.tar.gz
drakx-backup-do-not-use-ad64ed5bbe42c433aa7900c97b5aa13b6aa2539d.tar.bz2
drakx-backup-do-not-use-ad64ed5bbe42c433aa7900c97b5aa13b6aa2539d.tar.xz
drakx-backup-do-not-use-ad64ed5bbe42c433aa7900c97b5aa13b6aa2539d.zip
Revert explicit dracut invocation to mkinird - dracut/mkinitrd execution is
managed by alternatives already. This allows dracut and mkinitrd-based environments to co-exist.
-rw-r--r--perl-install/bootloader.pm6
1 files changed, 3 insertions, 3 deletions
diff --git a/perl-install/bootloader.pm b/perl-install/bootloader.pm
index f9362fa94..52ecdc89f 100644
--- a/perl-install/bootloader.pm
+++ b/perl-install/bootloader.pm
@@ -116,12 +116,12 @@ sub mkinitrd {
modules::load('loop');
my @options = (
- if_($::isInstall), "-f", $initrd, $kernel_version,
+ if_($::isInstall, "-v"), "-f", $initrd, $kernel_version,
if_($entry->{initrd_options}, split(' ', $entry->{initrd_options})),
);
- if (!run_program::rooted($::prefix, 'dracut', @options)) {
+ if (!run_program::rooted($::prefix, 'mkinitrd', @options)) {
unlink("$::prefix/$initrd");
- die "dracut failed:\n(dracut @options)";
+ die "mkinitrd failed:\n(mkinitrd @options)";
}
add_boot_splash($initrd, $entry->{vga} || $bootloader->{vga});