[syslinux:master] ldlinux: Allow a held shift key to override UI as well as DEFAULT

[syslinux-bot for H. Peter Anvin]

Commit-ID:  7e7139788c8ac6ffbf474976ad4d1727e0677b9f
Gitweb:     http://www.syslinux.org/commit/7e7139788c8ac6ffbf474976ad4d1727e0677b9f
Author:     H. Peter Anvin <hpa at zytor.com>
AuthorDate: Wed, 21 May 2014 21:32:32 -0700
Committer:  H. Peter Anvin <hpa at zytor.com>
CommitDate: Wed, 21 May 2014 21:33:54 -0700

ldlinux: Allow a held shift key to override UI as well as DEFAULT

For compatibility with 4.xx, make a held shift escape to override UI
as well as DEFAULT.

Signed-off-by: H. Peter Anvin <hpa at zytor.com>

---
 com32/elflink/ldlinux/ldlinux.c | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/com32/elflink/ldlinux/ldlinux.c b/com32/elflink/ldlinux/ldlinux.c
index 9b01dd3..2e4d08a 100644
--- a/com32/elflink/ldlinux/ldlinux.c
+++ b/com32/elflink/ldlinux/ldlinux.c
@@ -337,10 +337,7 @@ __export int main(int argc __unused, char **argv)
 		ldlinux_enter_command();
 	}
 
-	if (!forceprompt && !shift_is_held())
-		ldlinux_auto_boot();
-
-	if (defaultlevel > 1)
+	if (!shift_is_held() && (!forceprompt || defaultlevel > 1))
 		ldlinux_auto_boot();
 
 	ldlinux_enter_command();