Skip to content

Commit c920c76

Browse files
committed
Replace mod+i with mod+j
ctrl+i is interpreted as the tab key. For multi-selection support on the snapshot screen, the tab key needs to be used. If --expect=ctrl-i is set, the tab key becomes a shortcut key to the chroot handler. Switch to ctrl-j on the primary and snapshot screens and then update documentation to reflect the change.
1 parent a1eb1bf commit c920c76

File tree

10 files changed

+14
-14
lines changed

10 files changed

+14
-14
lines changed

90zfsbootmenu/help-files/134/main-screen.pod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
[MOD+R] recovery shell
2929
Execute a Bash shell with minimal tooling, enabling system maintenance.
3030

31-
[MOD+I] interactive chroot
31+
[MOD+J] jump into chroot
3232
Enter a chroot of the selected boot environment. The boot environment is mounted read/write if the zpool is imported read/write.
3333

3434
[MOD+W] import read/write

90zfsbootmenu/help-files/134/snapshot-management.pod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838

3939
The operation will fail gracefully if the pool can not be set read/write.
4040

41-
[MOD+I] interactive chroot
41+
[MOD+J] jump into chroot
4242
Enter a chroot of the selected boot environment snapshot. The snapshot is always mounted read-only.
4343

4444
[MOD+O] sort order

90zfsbootmenu/help-files/54/main-screen.pod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
Execute a Bash shell with minimal tooling, enabling
3939
system maintenance.
4040

41-
[MOD+I] interactive chroot
41+
[MOD+J] jump into chroot
4242
Enter a chroot of the selected boot environment. The
4343
boot environment is mounted read/write if the zpool
4444
is imported read/write.

90zfsbootmenu/help-files/54/snapshot-management.pod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@
5656
The operation will fail gracefully if the pool can
5757
not be set read/write.
5858

59-
[MOD+I] interactive chroot
59+
[MOD+J] jump into chroot
6060
Enter a chroot of the selected boot environment
6161
snapshot. The snapshot is always mounted read-only.
6262

90zfsbootmenu/help-files/94/main-screen.pod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
[MOD+R] recovery shell
3131
Execute a Bash shell with minimal tooling, enabling system maintenance.
3232

33-
[MOD+I] interactive chroot
33+
[MOD+J] jump into chroot
3434
Enter a chroot of the selected boot environment. The boot environment is mounted read/write
3535
if the zpool is imported read/write.
3636

90zfsbootmenu/help-files/94/snapshot-management.pod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343

4444
The operation will fail gracefully if the pool can not be set read/write.
4545

46-
[MOD+I] interactive chroot
46+
[MOD+J] jump into chroot
4747
Enter a chroot of the selected boot environment snapshot. The snapshot is always mounted
4848
read-only.
4949

90zfsbootmenu/zfsbootmenu-lib.sh

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -492,10 +492,10 @@ draw_be() {
492492
header="$( header_wrap \
493493
"[RETURN] boot" "[ESCAPE] refresh view" "[CTRL+P] pool status" "" \
494494
"[CTRL+D] set bootfs" "[CTRL+S] snapshots" "[CTRL+K] kernels" "" \
495-
"[CTRL+E] edit kcl" "[CTRL+I] interactive chroot" "[CTRL+R] recovery shell" "" \
495+
"[CTRL+E] edit kcl" "[CTRL+J] jump into chroot" "[CTRL+R] recovery shell" "" \
496496
"[CTRL+L] view logs" " " "[CTRL+H] help" )"
497497

498-
expects="--expect=alt-e,alt-k,alt-d,alt-s,alt-c,alt-r,alt-p,alt-w,alt-i,alt-o"
498+
expects="--expect=alt-e,alt-k,alt-d,alt-s,alt-c,alt-r,alt-p,alt-w,alt-j,alt-o"
499499

500500
if ! selected="$( ${FUZZYSEL} -0 --prompt "BE > " \
501501
${expects} ${expects//alt-/ctrl-} ${expects//alt-/ctrl-alt-} \
@@ -573,10 +573,10 @@ draw_snapshots() {
573573

574574
header="$( header_wrap "[RETURN] duplicate" "[ESCAPE] back" "" \
575575
"[CTRL+X] clone and promote" "[CTRL+C] clone only" "" \
576-
"[CTRL+I] interactive chroot" "[CTRL+D] show diff" "" \
576+
"[CTRL+J] jump into chroot" "[CTRL+D] show diff" "" \
577577
"[CTRL+L] view logs" "[CTRL+H] help" )"
578578

579-
expects="--expect=alt-x,alt-c,alt-i,alt-o"
579+
expects="--expect=alt-x,alt-c,alt-j,alt-o"
580580

581581
if ! selected="$( zfs list -t snapshot -H -o name "${benv}" -S "${sort_key}" |
582582
HELP_SECTION=snapshot-management ${FUZZYSEL} \

90zfsbootmenu/zfsbootmenu.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -229,7 +229,7 @@ while true; do
229229
tput cnorm
230230

231231
case "${subkey}" in
232-
"mod-i")
232+
"mod-j")
233233
zfs_chroot "${selected_snap}"
234234
BE_SELECTED=1
235235
continue
@@ -337,7 +337,7 @@ while true; do
337337
echo "${cmdline}" > "${BASE}/cmdline"
338338
fi
339339
;;
340-
"mod-i")
340+
"mod-j")
341341
zfs_chroot "${selected_be}"
342342
;;
343343
"mod-o")

pod/online/main-screen.pod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ View the health and status of each imported pool.
3838

3939
Execute a Bash shell with minimal tooling, enabling system maintenance.
4040

41-
=item I<[MOD+I]> B<interactive chroot>
41+
=item I<[MOD+J]> B<jump into chroot>
4242

4343
Enter a chroot of the selected boot environment. The boot environment is mounted I<read/write> if the zpool is imported I<read/write>.
4444

pod/online/snapshot-management.pod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ Compare the differences between the selected snapshot and the current state of t
4343

4444
The operation will fail gracefully if the pool can not be set I<read/write>.
4545

46-
=item I<[MOD+I]> B<interactive chroot>
46+
=item I<[MOD+J]> B<jump into chroot>
4747

4848
Enter a chroot of the selected boot environment snapshot. The snapshot is always mounted read-only.
4949

0 commit comments

Comments
 (0)