diff --git a/debian/changelog b/debian/changelog index 6649fdc6..cfb54d41 100644 --- a/debian/changelog +++ b/debian/changelog @@ -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 Fri, 18 Oct 2013 16:29:56 -0500 diff --git a/usr/bin/byobu-reconnect-sockets b/usr/bin/byobu-reconnect-sockets index 9d909fd3..46f28a58 100755 --- a/usr/bin/byobu-reconnect-sockets +++ b/usr/bin/byobu-reconnect-sockets @@ -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) diff --git a/usr/bin/byobu-select-session b/usr/bin/byobu-select-session index 9f626643..c8c1ff2c 100755 --- a/usr/bin/byobu-select-session +++ b/usr/bin/byobu-select-session @@ -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():