diff options
| author | Thierry Vignaud <tv@mageia.org> | 2012-12-11 17:42:42 +0000 |
|---|---|---|
| committer | Thierry Vignaud <tv@mageia.org> | 2012-12-11 17:42:42 +0000 |
| commit | cadd12250ac168a0f8ff018cd9c79046c3ef3aac (patch) | |
| tree | 53e706dacf0612f1f46298f809e631df9b3cbc40 | |
| parent | d1802bfd39bdba8ffa3919f7377150c171e531da (diff) | |
| download | drakx-cadd12250ac168a0f8ff018cd9c79046c3ef3aac.tar drakx-cadd12250ac168a0f8ff018cd9c79046c3ef3aac.tar.gz drakx-cadd12250ac168a0f8ff018cd9c79046c3ef3aac.tar.bz2 drakx-cadd12250ac168a0f8ff018cd9c79046c3ef3aac.tar.xz drakx-cadd12250ac168a0f8ff018cd9c79046c3ef3aac.zip | |
(add_kernel) revert rosa crap that breaks generating initrd (mga#8357)
| -rw-r--r-- | perl-install/bootloader.pm | 12 | ||||
| -rw-r--r-- | perl-install/install/NEWS | 2 |
2 files changed, 6 insertions, 8 deletions
diff --git a/perl-install/bootloader.pm b/perl-install/bootloader.pm index 834c7920a..f6f110220 100644 --- a/perl-install/bootloader.pm +++ b/perl-install/bootloader.pm @@ -755,10 +755,6 @@ sub add_kernel { if (!$b_no_initrd) { $v->{initrd} = mkinitrd($kernel_str->{version}, $bootloader, $v, "/boot/$initrd_long"); - } else { - # we just set up copy of the universal initrd, and we need to add proper info - # in bootloader configuration - $v->{initrd} = '/boot/initrd.img'; } if (!$b_nolink) { @@ -771,7 +767,7 @@ sub add_kernel { _do_the_symlink($bootloader, $v->{kernel_or_dev}, $vmlinuz_long); } - if ($v->{initrd} && !$b_no_initrd) { + if ($v->{initrd}) { $v->{initrd} = '/boot/' . kernel_str2initrd_short($kernel_str); if (arch() =~ /mips/) { log::l("link $::prefix/boot/$initrd_long -> $::prefix$v->{initrd}"); @@ -1085,15 +1081,15 @@ sub suggest { if_($options{vga_fb}, vga => $options{vga_fb}), #- using framebuffer if_($options{vga_fb} && $options{splash}, append => "splash"), if_($options{quiet}, append => "splash quiet"), - }, "", 1); + }); if ($options{vga_fb} && $e->{label} eq 'linux') { - add_kernel($bootloader, $kernel, { root => $root, label => 'linux-nonfb' }, "", 1); + add_kernel($bootloader, $kernel, { root => $root, label => 'linux-nonfb' }); } } add_kernel($bootloader, $kernels[0], - { root => $root, label => 'failsafe', append => 'failsafe' }, "", 1) + { root => $root, label => 'failsafe', append => 'failsafe' }) if @kernels; if (arch() =~ /ppc/) { diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS index 8ffeb1b56..fc8915af3 100644 --- a/perl-install/install/NEWS +++ b/perl-install/install/NEWS @@ -1,3 +1,5 @@ +- revert rosa crap that breaks generating initrd (mga#8357) + Version 15.9 - 11 December 2012 - fix network set up for adding network media if not up by stage1 |