From 85a0d62e4364fcf9051676504178e1ea56defc0e Mon Sep 17 00:00:00 2001
From: Lunar <lunar@torproject.org>
Date: Sat, 14 Feb 2015 11:21:07 -0500
Subject: grub.cfg: add another SYSLINUX config location

`syslinux/syslinux.cfg` is at least used by Tails.
---
(limited to 'resources/grub')

diff --git a/resources/grub/config/menuentries/common.cfg b/resources/grub/config/menuentries/common.cfg
index da6968c..1a6c6bf 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
--
cgit v0.9.1