aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLunar <lunar@torproject.org>2015-02-14 17:21:07 +0100
committerFrancis Rowe <info@gluglug.org.uk>2015-02-13 16:31:42 +0000
commit85a0d62e4364fcf9051676504178e1ea56defc0e (patch)
treea78a16927f4d5fbff270120ff83530672e897d2c
parentbb6eb99ee619044c2fe8cb8753096f1fb536b78d (diff)
downloadlibrebootfr-85a0d62e4364fcf9051676504178e1ea56defc0e.tar.gz
librebootfr-85a0d62e4364fcf9051676504178e1ea56defc0e.zip
grub.cfg: add another SYSLINUX config location
`syslinux/syslinux.cfg` is at least used by Tails.
-rw-r--r--resources/grub/config/menuentries/common.cfg4
1 files changed, 4 insertions, 0 deletions
diff --git a/resources/grub/config/menuentries/common.cfg b/resources/grub/config/menuentries/common.cfg
index da6968c1..1a6c6bf1 100644
--- a/resources/grub/config/menuentries/common.cfg
+++ b/resources/grub/config/menuentries/common.cfg
@@ -27,6 +27,8 @@ menuentry 'Parse ISOLINUX menu (USB)' {
set root=$x
if [ -f "/isolinux/isolinux.cfg" ] ; then
syslinux_configfile -i /isolinux/isolinux.cfg
+ elif [ -f "/syslinux/syslinux.cfg" ] ; then
+ syslinux_configfile -i /syslinux/syslinux.cfg
elif [ -f "/menu.cfg" ] ; then
syslinux_configfile -i /menu.cfg
elif [ -f "/txt.cfg" ] ; then
@@ -42,6 +44,8 @@ menuentry 'Parse ISOLINUX menu (CD/DVD)' {
set root=$x
if [ -f "/isolinux/isolinux.cfg" ] ; then
syslinux_configfile -i /isolinux/isolinux.cfg
+ elif [ -f "/syslinux/syslinux.cfg" ] ; then
+ syslinux_configfile -i /syslinux/syslinux.cfg
elif [ -f "/menu.cfg" ] ; then
syslinux_configfile -i /menu.cfg
elif [ -f "/txt.cfg" ] ; then