From 38fa582f9221ccb5d1b2ac098274c356d502b6e8 Mon Sep 17 00:00:00 2001 From: Dustin Kirkland Date: Mon, 31 Aug 2015 11:51:46 -0500 Subject: [PATCH] * usr/bin/byobu-launcher.in: LP: #1338260 - add some helpful information about nested sessions --- debian/changelog | 2 ++ usr/bin/byobu-launcher.in | 5 +++++ 2 files changed, 7 insertions(+) diff --git a/debian/changelog b/debian/changelog index f6a79809..c14dd15f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -23,6 +23,8 @@ byobu (5.95) unreleased; urgency=medium * usr/bin/byobu.in: LP: #1369783 - respect user's custom default-command and/or default-shell in the first window launched + * usr/bin/byobu-launcher.in: LP: #1338260 + - add some helpful information about nested sessions [ Fortunato Ventre ] * usr/lib/byobu/include/constants: diff --git a/usr/bin/byobu-launcher.in b/usr/bin/byobu-launcher.in index 8f5af52c..54b76a4d 100755 --- a/usr/bin/byobu-launcher.in +++ b/usr/bin/byobu-launcher.in @@ -36,9 +36,14 @@ if [ -O "$HOME" ]; then # Safeguard against ssh-ing into ourself, which causes an infinite loop exec $BYOBU_PREFIX/bin/byobu "$@" else + echo "INFO: Disabling auto-launch of Byobu in this SSH connection, to avoid a potential infinite loop" 1>&2 + echo "INFO: You can still run 'byobu' manually at the command line, if you know what you're doing" 1>&2 true fi else + echo "INFO: Disabling auto-launch of Byobu in this nested session, to avoid a potential infinite loop" 1>&2 + echo "INFO: You can still run 'byobu' manually at the command line, if you know what you're doing" 1>&2 + echo "INFO: And you can set LC_BYOBU=1 in your environment to override this safeguard.\n" 1>&2 true fi ;;