aboutsummaryrefslogtreecommitdiffstats
path: root/com32/elflink/ldlinux
diff options
context:
space:
mode:
authorH. Peter Anvin <hpa@zytor.com>2014-05-21 21:32:32 -0700
committerH. Peter Anvin <hpa@zytor.com>2014-05-21 21:33:54 -0700
commit7e7139788c8ac6ffbf474976ad4d1727e0677b9f (patch)
tree3d052e44a5eec37840f8cb8b394cbf1f9eb7b2b3 /com32/elflink/ldlinux
parent93f89ce6697adffcb3b40d758445ff9adf18b6d4 (diff)
downloadsyslinux-7e7139788c8ac6ffbf474976ad4d1727e0677b9f.tar.gz
syslinux-7e7139788c8ac6ffbf474976ad4d1727e0677b9f.tar.xz
syslinux-7e7139788c8ac6ffbf474976ad4d1727e0677b9f.zip
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@zytor.com>
Diffstat (limited to 'com32/elflink/ldlinux')
-rw-r--r--com32/elflink/ldlinux/ldlinux.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/com32/elflink/ldlinux/ldlinux.c b/com32/elflink/ldlinux/ldlinux.c
index 9b01dd3a..2e4d08a5 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();