* usr/bin/byobu-reconnect-sockets, usr/bin/byobu-select-session:

- LP: #1243017
  - add a few environment variables to restore, including upstart
    to ensure upstart commands resume working in a session restart
This commit is contained in:
Dustin Kirkland 2013-11-01 14:57:30 -05:00
commit e4674ba56d
3 changed files with 6 additions and 2 deletions

4
debian/changelog vendored
View file

@ -8,6 +8,10 @@ byobu (5.62) unreleased; urgency=low
- customizations of screen configuration should go in
$BYOBU_CONFIG_DIR/.screenrc, which will be sourced last; rather than
~/.screenrc (which should be reserved for screen-without-byobu)
* usr/bin/byobu-reconnect-sockets, usr/bin/byobu-select-session:
- LP: #1243017
- add a few environment variables to restore, including upstart
to ensure upstart commands resume working in a session restart
-- Dustin Kirkland <kirkland@ubuntu.com> Fri, 18 Oct 2013 16:29:56 -0500

View file

@ -81,7 +81,7 @@ tmux_update () {
}
# Pull environment variables/values from backend and update/export here
VARS_TO_UPDATE="DISPLAY DBUS_SESSION_BUS_ADDRESS SESSION_MANAGER GPG_AGENT_INFO XDG_SESSION_COOKIE XDG_SESSION_PATH GNOME_KEYRING_CONTROL GNOME_KEYRING_PID GPG_AGENT_INFO SSH_AUTH_SOCK SSH_AGENT_PID"
VARS_TO_UPDATE="DISPLAY DBUS_SESSION_BUS_ADDRESS SESSION_MANAGER GPG_AGENT_INFO XDG_SESSION_COOKIE XDG_SESSION_PATH GNOME_KEYRING_CONTROL GNOME_KEYRING_PID GPG_AGENT_INFO SSH_ASKPASS SSH_AUTH_SOCK SSH_AGENT_PID WINDOWID UPSTART_JOB UPSTART_EVENTS UPSTART_SESSION UPSTART_INSTANCE"
case $BYOBU_BACKEND in
tmux)

View file

@ -34,7 +34,7 @@ choice = -1
sessions = []
text = []
BYOBU_UPDATE_ENVVARS = ["DISPLAY", "DBUS_SESSION_BUS_ADDRESS", "SESSION_MANAGER", "GPG_AGENT_INFO", "XDG_SESSION_COOKIE", "XDG_SESSION_PATH", "GNOME_KEYRING_CONTROL", "GNOME_KEYRING_PID", "GPG_AGENT_INFO", "SSH_AUTH_SOCK", "SSH_AGENT_PID"]
BYOBU_UPDATE_ENVVARS = ["DISPLAY", "DBUS_SESSION_BUS_ADDRESS", "SESSION_MANAGER", "GPG_AGENT_INFO", "XDG_SESSION_COOKIE", "XDG_SESSION_PATH", "GNOME_KEYRING_CONTROL", "GNOME_KEYRING_PID", "GPG_AGENT_INFO", "SSH_ASKPASS", "SSH_AUTH_SOCK", "SSH_AGENT_PID", "WINDOWID", "UPSTART_JOB", "UPSTART_EVENTS", "UPSTART_SESSION", "UPSTART_INSTANCE"]
def get_sessions():