summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLyndon Brown <jnqnfe@gmail.com>2020-03-27 02:07:08 +0000
committerRaphaƫl Hertzog <raphael@offensive-security.com>2020-04-23 10:18:43 +0200
commit46b0d85021311ed83349a57307fae82b60a2153c (patch)
tree590ae3fc8c8fa501189c7c3355fd8f0fd6bd6bbe
parent5ac625e3e16704a795be41b4b40ce0b1c1a5b1eb (diff)
downloadvyos-live-build-46b0d85021311ed83349a57307fae82b60a2153c.tar.gz
vyos-live-build-46b0d85021311ed83349a57307fae82b60a2153c.zip
grub2|loopback: avoid empty submenu
don't include the advanced menu at all if it's only entry - memtest - is not included (you just get a menu entry that does nothing, which may confused users into thinking that something is broken, as opposed to showing an empty submenu as i expected). Gbp-Dch: Short
-rw-r--r--share/bootloaders/grub-pc/grub.cfg4
1 files changed, 2 insertions, 2 deletions
diff --git a/share/bootloaders/grub-pc/grub.cfg b/share/bootloaders/grub-pc/grub.cfg
index 03e681f49..a1e6a1895 100644
--- a/share/bootloaders/grub-pc/grub.cfg
+++ b/share/bootloaders/grub-pc/grub.cfg
@@ -57,11 +57,11 @@ submenu 'Advanced install options...' {
}
fi
+if @ENABLE_MEMTEST@; then
submenu 'Advanced options...' --hotkey=a {
# Memtest (if any)
- if @ENABLE_MEMTEST@; then
source /boot/grub/memtest.cfg
- fi
}
+fi