diff options
| author | Thierry Vignaud <tv@mageia.org> | 2013-02-26 06:35:55 +0000 |
|---|---|---|
| committer | Thierry Vignaud <tv@mageia.org> | 2013-02-26 06:35:55 +0000 |
| commit | 157d49ac630e60f470baea40982ee29ace0fe6f3 (patch) | |
| tree | e886ede37a094337a33a9efe201ecde174731964 | |
| parent | f92ac78fc522513e9d1b8de7d6212271532a2021 (diff) | |
| download | drakx-157d49ac630e60f470baea40982ee29ace0fe6f3.tar drakx-157d49ac630e60f470baea40982ee29ace0fe6f3.tar.gz drakx-157d49ac630e60f470baea40982ee29ace0fe6f3.tar.bz2 drakx-157d49ac630e60f470baea40982ee29ace0fe6f3.tar.xz drakx-157d49ac630e60f470baea40982ee29ace0fe6f3.zip | |
(read_grub2,install_grub2) read & write /boot/grub2/drakboot.conf
| -rw-r--r-- | perl-install/NEWS | 1 | ||||
| -rw-r--r-- | perl-install/bootloader.pm | 3 | ||||
| -rw-r--r-- | perl-install/install/NEWS | 1 |
3 files changed, 4 insertions, 1 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS index f75c75a69..d876d8d50 100644 --- a/perl-install/NEWS +++ b/perl-install/NEWS @@ -1,4 +1,5 @@ - drakboot: + o read & write /boot/grub2/drakboot.conf o prevent installing grub2 somewhere else than MBR - always bypass blkid cache (the cache only includes a subset of the data we need) diff --git a/perl-install/bootloader.pm b/perl-install/bootloader.pm index f15db5f51..9e8a7d66a 100644 --- a/perl-install/bootloader.pm +++ b/perl-install/bootloader.pm @@ -234,7 +234,7 @@ sub read { } sub read_grub2 { - {}; + my %bootloader = getVarsFromSh("$::prefix/boot/grub2/drakboot.conf"); } sub read_grub { @@ -1975,6 +1975,7 @@ sub install_grub2 { run_program::rooted($::prefix, 'grub2-mkconfig', '2>', \$error, '-o', $grub2_cfg) or die "grub2-mkconfig failed: $error"; } run_program::rooted($::prefix, 'grub2-install', '2>', \$error, $bootloader->{boot}) or die "grub2-install failed: $error"; + setVarsInSh("$::prefix/boot/grub2/drakboot.conf", { boot => $bootloader->{boot} }); } sub install_grub { diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS index cbfde9e29..e084750c1 100644 --- a/perl-install/install/NEWS +++ b/perl-install/install/NEWS @@ -1,5 +1,6 @@ - summary: o prevent installing grub2 somewhere else than MBR + o read & write /boot/grub2/drakboot.conf o suggests MBR by default for grub2 too (Manuel Hiebel, #8851) - always bypass blkid cache (the cache only includes a subset of the data we need) |