summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Whitaker <mageia@martin-whitaker.me.uk>2018-10-23 20:11:53 +0100
committerMartin Whitaker <mageia@martin-whitaker.me.uk>2018-10-28 21:46:20 +0000
commit17fd0a64991e31a7d512bfb0bc3778f9440d332c (patch)
tree76829f651cea6735d825d94296f7fc72b197aab0
parentb4ace6cb70f12af823200af7204a87690595a85c (diff)
downloaddrakiso-17fd0a64991e31a7d512bfb0bc3778f9440d332c.tar
drakiso-17fd0a64991e31a7d512bfb0bc3778f9440d332c.tar.gz
drakiso-17fd0a64991e31a7d512bfb0bc3778f9440d332c.tar.bz2
drakiso-17fd0a64991e31a7d512bfb0bc3778f9440d332c.tar.xz
drakiso-17fd0a64991e31a7d512bfb0bc3778f9440d332c.zip
BuildBoot: remember boot mode when chaining through grub submenus.
-rw-r--r--examples/gui/config/build.cfg1
-rw-r--r--examples/minimal/config/build.cfg1
-rw-r--r--examples/xfce/config/build.cfg1
-rw-r--r--lib/MGA/DrakISO/BuildBoot.pm1
4 files changed, 4 insertions, 0 deletions
diff --git a/examples/gui/config/build.cfg b/examples/gui/config/build.cfg
index 4cbaa67..3948478 100644
--- a/examples/gui/config/build.cfg
+++ b/examples/gui/config/build.cfg
@@ -176,6 +176,7 @@ my $config = {
# },
media => {
label => build_label($build),
+ overlay_label => 'mgalive-persist',
bootloader_title => build_title($build),
bootloader_theme => '/usr/share/drakiso/bootloader/maggy',
bootloader_font => '/usr/share/drakiso/bootloader/unicode.pf2',
diff --git a/examples/minimal/config/build.cfg b/examples/minimal/config/build.cfg
index 9419d10..089467e 100644
--- a/examples/minimal/config/build.cfg
+++ b/examples/minimal/config/build.cfg
@@ -151,6 +151,7 @@ my $config = {
# },
media => {
label => build_label($build),
+ overlay_label => 'mgalive-persist',
bootloader_title => build_title($build),
bootloader_theme => '/usr/share/drakiso/bootloader/maggy',
bootloader_font => '/usr/share/drakiso/bootloader/unicode.pf2',
diff --git a/examples/xfce/config/build.cfg b/examples/xfce/config/build.cfg
index 6b1f6c1..db9b6d9 100644
--- a/examples/xfce/config/build.cfg
+++ b/examples/xfce/config/build.cfg
@@ -224,6 +224,7 @@ my $config = {
# },
media => {
label => build_label($build),
+ overlay_label => 'mgalive-persist',
bootloader_title => build_title($build),
bootloader_theme => '/usr/share/drakiso/bootloader/maggy',
bootloader_font => '/usr/share/drakiso/bootloader/unicode.pf2',
diff --git a/lib/MGA/DrakISO/BuildBoot.pm b/lib/MGA/DrakISO/BuildBoot.pm
index f3b57a9..a7481fd 100644
--- a/lib/MGA/DrakISO/BuildBoot.pm
+++ b/lib/MGA/DrakISO/BuildBoot.pm
@@ -522,6 +522,7 @@ sub build_efi_grub2_cfg {
"set prefix=(\$root)/boot/grub2",
"",
"set efi=true",
+ "export efi",
"",
". \$prefix/grub.cfg",
"",