diff options
| author | Thomas Backlund <tmb@mageia.org> | 2015-04-20 23:15:18 +0259 |
|---|---|---|
| committer | Thomas Backlund <tmb@mageia.org> | 2015-04-20 23:15:18 +0259 |
| commit | 0ce20b33acee39ca684f12d213dc46ffb819825f (patch) | |
| tree | e49eb2c11a8b6434aa7668286f5f028f16944530 | |
| parent | 8dd2cec2346a1a7ca31ad8ffa219d98cc5719930 (diff) | |
| download | drakx-0ce20b33acee39ca684f12d213dc46ffb819825f.tar drakx-0ce20b33acee39ca684f12d213dc46ffb819825f.tar.gz drakx-0ce20b33acee39ca684f12d213dc46ffb819825f.tar.bz2 drakx-0ce20b33acee39ca684f12d213dc46ffb819825f.tar.xz drakx-0ce20b33acee39ca684f12d213dc46ffb819825f.zip | |
- bootloader:
o dont override 'splash' and/or 'quiet' when adding 'noiswmd' (mga#15666)
| -rw-r--r-- | perl-install/NEWS | 2 | ||||
| -rw-r--r-- | perl-install/bootloader.pm | 7 |
2 files changed, 5 insertions, 4 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS index 07e0246e4..06274289d 100644 --- a/perl-install/NEWS +++ b/perl-install/NEWS @@ -1,3 +1,5 @@ +- bootloader: + o dont override 'splash' and/or 'quiet' when adding 'noiswmd' (mga#15666) - partitioning_wizard: o use the windows partition with the most available space on current disk, not the last one across all disks (mga#15589) diff --git a/perl-install/bootloader.pm b/perl-install/bootloader.pm index 48a2cc4b2..e8d7d1973 100644 --- a/perl-install/bootloader.pm +++ b/perl-install/bootloader.pm @@ -1180,9 +1180,8 @@ sub suggest { { root => $root, if_($options{vga_fb}, vga => $options{vga_fb}), #- using framebuffer - if_($options{vga_fb} && $options{splash}, append => "splash"), - if_($options{quiet}, append => "splash quiet"), - if_($::isInstall, append => "noiswmd"), + if_($options{vga_fb} && $options{splash}, append => "splash noiswmd"), + if_($options{quiet}, append => "splash quiet noiswmd"), }); if ($options{vga_fb} && $e->{label} eq 'linux') { @@ -1191,7 +1190,7 @@ sub suggest { } add_kernel($bootloader, $kernels[0], - { root => $root, label => 'failsafe', append => 'failsafe' }) + { root => $root, label => 'failsafe', append => 'failsafe noiswmd' }) if @kernels; #- search for dos (or windows) boot partition. Do not look in extended partitions! |