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

[syslinux-bot for H. Peter Anvin]

Commit-ID:  616d86cb26b13f6dcab511a515eab437ea2cb652
Gitweb:     http://www.syslinux.org/commit/616d86cb26b13f6dcab511a515eab437ea2cb652
Author:     H. Peter Anvin <hpa at zytor.com>
AuthorDate: Tue, 10 Jun 2014 13:14:03 -0700
Committer:  H. Peter Anvin <hpa at zytor.com>
CommitDate: Tue, 10 Jun 2014 13:14:03 -0700

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

This reverts commit 7e7139788c8ac6ffbf474976ad4d1727e0677b9f.

Requested by Ady <ady-sf at hotmail.com> who also requested the original
patch:

After some tests with MENU SHIFTKEY with different versions of
Syslinux, I came to the conclusion that, at least for now, it would
be better to undo commit 7e7139788c8ac6ffbf474976ad4d1727e0677b9f:

 "ldlinux: Allow a held shift key to override UI as well as DEFAULT"
committed on Thu, 22 May 2014.

Although the aforementioned commit makes the current 6.03 branch
behave as version 4.xx, my tests show that the behavior is
effectively inadequate and inconsistent.

Although I had been previously nagging you in irc about maintaining
backward compatibility of the "force-prompt" keys, I have to ask you
to undo the aforementioned commit before the final release of 6.03
stable. The behavior of Syslinux 6.03 without this particular commit
will slightly "break" with the prior "force-prompt" behavior as seen
in 4.xx when using [vesa]menu.c32, but it will be more consistent and
clean.

Without this commit, the user can still avoid the automatic launch of
the default label by the same means (the "escape" "shift" keys),
which is the most important characteristic of MENU SHIFTKEY.

Please consider this request before the release of 6.03 stable.

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

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

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