github/byobu
1
0
Fork 0
mirror of https://github.com/dustinkirkland/byobu synced 2025-08-22 22:34:23 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

byobu-launcher, byobu-janitor: sometimes the ssh socket link can become

Browse source 
a symlink to itself, causing byobu to fail to start due to too many
levels of symlinks; remove the link first, before creating it;
LP: #440221
This commit is contained in:
Dustin Kirkland 2009-10-01 21:45:14 -05:00
commit 8cb93515ee
3 changed files with 13 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

5
byobu-janitor
View file

@ -34,7 +34,10 @@ DEFAULT_PROFILE="light"
PROFILE="$HOME/.$PKG/profile" PROFILE="$HOME/.$PKG/profile"
# Establish ssh-agent socket, helps when reconnecting to a detached session # Establish ssh-agent socket, helps when reconnecting to a detached session
[ -r "$SSH_AUTH_SOCK" ] && [ -w "$RUN" ] && ln -sf "$SSH_AUTH_SOCK" "$RUN/$PKG.ssh-agent" if [ -S "$SSH_AUTH_SOCK" ] && [ -w "$RUN" ]; then
rm -f "$RUN/$PKG.ssh-agent"
ln -sf "$SSH_AUTH_SOCK" "$RUN/$PKG.ssh-agent"
fi
# Affects: users who launched using sudo, such that their config dir # Affects: users who launched using sudo, such that their config dir
# is not writable by them # is not writable by them

5
byobu-launcher
View file

@ -33,7 +33,10 @@ else
# Set window title # Set window title
printf "\033]0;${USER}@$(hostname) - ${PKG}\007" printf "\033]0;${USER}@$(hostname) - ${PKG}\007"
# Update ssh-agent socket # Update ssh-agent socket
[ -r "$SSH_AUTH_SOCK" ] && [ -w "$RUN" ] && ln -sf "$SSH_AUTH_SOCK" "$RUN/$PKG.ssh-agent" if [ -S "$SSH_AUTH_SOCK" ] && [ -w "$RUN" ]; then
rm -f "$RUN/$PKG.ssh-agent"
ln -sf "$SSH_AUTH_SOCK" "$RUN/$PKG.ssh-agent"
fi
# Re-attach to existing session # Re-attach to existing session
exec screen -xRR exec screen -xRR
fi fi

6
debian/changelog vendored
View file

@ -2,8 +2,12 @@ byobu (2.36) unreleased; urgency=low
* bin/fan_speed: improve the logic for find the fan_speed system monitor * bin/fan_speed: improve the logic for find the fan_speed system monitor
LP: #439524 LP: #439524
* byobu-launcher, byobu-janitor: sometimes the ssh socket link can become
a symlink to itself, causing byobu to fail to start due to too many
levels of symlinks; remove the link first, before creating it;
LP: #440221
-- Dustin Kirkland <kirkland@ubuntu.com> Wed, 30 Sep 2009 13:16:38 -0500 -- Dustin Kirkland <kirkland@ubuntu.com> Thu, 01 Oct 2009 21:43:41 -0500
byobu (2.35-0ubuntu1) karmic; urgency=low byobu (2.35-0ubuntu1) karmic; urgency=low