diff options
| author | Thierry Vignaud <thierry.vignaud@gmail.com> | 2016-06-06 11:12:04 +0200 |
|---|---|---|
| committer | Thierry Vignaud <thierry.vignaud@gmail.com> | 2016-06-06 11:12:04 +0200 |
| commit | 8847eda6f7f8aaad07931290f1a37a5e44f7a426 (patch) | |
| tree | ecb29e134cc4fd3e7e4a2f2a3f147baa80b257bc | |
| parent | 9e602c73415f40b86e8ee7561940b8ee7cb5c1e6 (diff) | |
| download | drakx-8847eda6f7f8aaad07931290f1a37a5e44f7a426.tar drakx-8847eda6f7f8aaad07931290f1a37a5e44f7a426.tar.gz drakx-8847eda6f7f8aaad07931290f1a37a5e44f7a426.tar.bz2 drakx-8847eda6f7f8aaad07931290f1a37a5e44f7a426.tar.xz drakx-8847eda6f7f8aaad07931290f1a37a5e44f7a426.zip | |
enable to (un)install os-prober
| -rw-r--r-- | perl-install/NEWS | 1 | ||||
| -rw-r--r-- | perl-install/any.pm | 7 | ||||
| -rw-r--r-- | perl-install/install/NEWS | 1 |
3 files changed, 9 insertions, 0 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS index b2b73cc52..68ce10531 100644 --- a/perl-install/NEWS +++ b/perl-install/NEWS @@ -1,4 +1,5 @@ - drakboot: + o enable to (un)install os-prober (mga#16010, mga#18538) o fix reading back last grub2 entry o only overwrite GRUB_CMDLINE_LINUX_DEFAULT on first install (mga#18112) o set GRUB_DEFAULT + GRUB_SAVEDEFAULT (mga#9627, mga#16059) diff --git a/perl-install/any.pm b/perl-install/any.pm index e71132b69..8ca9553db 100644 --- a/perl-install/any.pm +++ b/perl-install/any.pm @@ -625,6 +625,7 @@ sub setupBootloader__grub2 { require network::network; #- to list network profiles my $vga = Xconfig::resolution_and_depth::from_bios($b->{vga}); + my $os_prober = run_program::rooted($::prefix, 'rpm', '-q', 'os-prober'); my $res = $in->ask_from_( { @@ -636,12 +637,18 @@ sub setupBootloader__grub2 { { label => N("Append"), val => \$append }, { label => N("Video mode"), val => \$vga, list => [ '', Xconfig::resolution_and_depth::bios_vga_modes() ], format => \&Xconfig::resolution_and_depth::to_string, advanced => 1 }, + { text => N("Probe Foreign OS"), val => \$os_prober, type => 'bool' }, ]); if ($res) { $b->{entries} = $b2->{entries}; $b->{default} = $default; $b->{vga} = ref($vga) ? $vga->{bios} : $vga; first(@{$b->{entries}})->{append} = $append; + if ($os_prober) { + $in->do_pkgs->ensure_is_installed('os-prober', '/usr/bin/os-prober'); + } else { + $in->do_pkgs->remove('os-prober'); + } 1; } else { ''; diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS index 965a782aa..c29edee58 100644 --- a/perl-install/install/NEWS +++ b/perl-install/install/NEWS @@ -1,4 +1,5 @@ - bootloader: + o enable to (un)install os-prober (mga#16010, mga#18538) o fix reading back last grub2 entry o only overwrite GRUB_CMDLINE_LINUX_DEFAULT on first install (mga#18112) o set GRUB_DEFAULT + GRUB_SAVEDEFAULT (mga#9627, mga#16059) |