summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mageia.org>2013-02-26 06:36:08 +0000
committerThierry Vignaud <tv@mageia.org>2013-02-26 06:36:08 +0000
commite6bcf5317254e458b255fc7d017fb7e1e2aab20a (patch)
tree226c8c060d24cef0c0ad89d0a008a1a88deeabda
parent2f6947108ac72e168d6f8b98e9f7f43929de11a6 (diff)
downloaddrakx-e6bcf5317254e458b255fc7d017fb7e1e2aab20a.tar
drakx-e6bcf5317254e458b255fc7d017fb7e1e2aab20a.tar.gz
drakx-e6bcf5317254e458b255fc7d017fb7e1e2aab20a.tar.bz2
drakx-e6bcf5317254e458b255fc7d017fb7e1e2aab20a.tar.xz
drakx-e6bcf5317254e458b255fc7d017fb7e1e2aab20a.zip
add proper support for grub2 for bootloader-config
-rw-r--r--perl-install/NEWS2
-rw-r--r--perl-install/bootloader.pm11
2 files changed, 13 insertions, 0 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS
index e87ebcf4e..8d14ac299 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -1,3 +1,5 @@
+- bootloader-config:
+ o add proper support for grub2 (detectloader, ...)
- drakboot:
o add basic support for reading back grub2 config
o read & write /boot/grub2/drakboot.conf
diff --git a/perl-install/bootloader.pm b/perl-install/bootloader.pm
index 68df8acd3..6171a1618 100644
--- a/perl-install/bootloader.pm
+++ b/perl-install/bootloader.pm
@@ -1778,6 +1778,12 @@ sub crypt_grub_password {
chomp_($res);
}
+sub write_grub2 {
+ my ($bootloader, $_all_hds, $o_backup_extension) = @_;
+ my $error;
+ my $grub2_cfg = '/boot/grub2/grub.cfg';
+ run_program::rooted($::prefix, 'grub2-mkconfig', '2>', \$error, '-o', $grub2_cfg) or die "grub2-mkconfig failed: $error";
+}
sub write_grub {
my ($bootloader, $all_hds, $o_backup_extension) = @_;
@@ -2013,6 +2019,11 @@ sub install_raw_grub() {
run_program::rooted($::prefix, "sh", "2>", \$error, '/boot/grub/install.sh') or die "grub failed: $error";
}
+sub when_config_changed_grub2 {
+ my ($_bootloader) = @_;
+ #- do not do anything
+}
+
sub when_config_changed_grub {
my ($_bootloader) = @_;
#- do not do anything