aboutsummaryrefslogtreecommitdiffstats
path: root/com32/elflink/ldlinux
diff options
context:
space:
mode:
authorH. Peter Anvin <hpa@zytor.com>2014-04-20 11:35:47 -0700
committerH. Peter Anvin <hpa@zytor.com>2014-04-20 11:46:59 -0700
commit81609df52ac52636a6d4af9249ede641620cb3a7 (patch)
treed9977268d435834ab26ccebb4ad28a2b3d44e50b /com32/elflink/ldlinux
parentb8752b88492d8f321037ad29e56a2fdf9e798e15 (diff)
downloadsyslinux-81609df52ac52636a6d4af9249ede641620cb3a7.tar.gz
syslinux-81609df52ac52636a6d4af9249ede641620cb3a7.tar.xz
syslinux-81609df52ac52636a6d4af9249ede641620cb3a7.zip
Centralize shift_is_held(), make it work to force the command linesyslinux-6.03-pre11
Holding down shift is supposed to force a command line unless noescape is provided; make it behave that way. Signed-off-by: H. Peter Anvin <hpa@zytor.com>
Diffstat (limited to 'com32/elflink/ldlinux')
-rw-r--r--com32/elflink/ldlinux/ldlinux.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/com32/elflink/ldlinux/ldlinux.c b/com32/elflink/ldlinux/ldlinux.c
index 76d117c7..9b01dd3a 100644
--- a/com32/elflink/ldlinux/ldlinux.c
+++ b/com32/elflink/ldlinux/ldlinux.c
@@ -337,8 +337,7 @@ __export int main(int argc __unused, char **argv)
ldlinux_enter_command();
}
- /* TODO: Check KbdFlags? */
- if (!forceprompt)
+ if (!forceprompt && !shift_is_held())
ldlinux_auto_boot();
if (defaultlevel > 1)