aboutsummaryrefslogtreecommitdiffstats
path: root/com32
diff options
context:
space:
mode:
authorH. Peter Anvin <hpa@zytor.com>2014-06-10 13:14:03 -0700
committerH. Peter Anvin <hpa@zytor.com>2014-06-10 13:14:03 -0700
commit616d86cb26b13f6dcab511a515eab437ea2cb652 (patch)
tree752579ec742fee8870035f5bf942a9a307a06234 /com32
parent5959441142ecdc792802964fbeebbdcc8b41d769 (diff)
downloadsyslinux-616d86cb26b13f6dcab511a515eab437ea2cb652.tar.gz
syslinux-616d86cb26b13f6dcab511a515eab437ea2cb652.tar.xz
syslinux-616d86cb26b13f6dcab511a515eab437ea2cb652.zip
Revert "ldlinux: Allow a held shift key to override UI as well as DEFAULT"
This reverts commit 7e7139788c8ac6ffbf474976ad4d1727e0677b9f. Requested by Ady <ady-sf@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@zytor.com>
Diffstat (limited to 'com32')
-rw-r--r--com32/elflink/ldlinux/ldlinux.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/com32/elflink/ldlinux/ldlinux.c b/com32/elflink/ldlinux/ldlinux.c
index 2e4d08a5..9b01dd3a 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();