Lubuntu/lubuntu-default-settings
10
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Workaround ssh agent not autostarted properly.

Browse Source
This commit is contained in:
Julien Lavergne 2012-11-06 21:30:32 +01:00
parent d40f118e9d
commit 0606fa4a68
3 changed files with 19 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
debian/changelog vendored
View File

@ -5,6 +5,7 @@ lubuntu-default-settings (0.30) UNRELEASED; urgency=low
- Use Ubuntu font in lxterminal. - Use Ubuntu font in lxterminal.
* usr/bin/startlubuntu* * usr/bin/startlubuntu*
- Install the lxterminal configuration file. - Install the lxterminal configuration file.
- Workaround ssh agent not autostarted properly.
* usr/share/lubuntu/openbox/rc.xml * usr/share/lubuntu/openbox/rc.xml
- Add shortcuts for windows tiling (SuperKey + the direction). - Add shortcuts for windows tiling (SuperKey + the direction).
- Set drawContents to "no" on resize, to reduce the use of resize. - Set drawContents to "no" on resize, to reduce the use of resize.

9
usr/bin/startlubuntu
View File

@ -76,5 +76,14 @@ if which gnome-keyring-daemon >/dev/null; then
export $(/usr/bin/gnome-keyring-daemon --start --components=ssh) export $(/usr/bin/gnome-keyring-daemon --start --components=ssh)
fi fi
# Start SSH agent, require since 3.5
# (see https://wiki.archlinux.org/index.php/Openbox#SSH_agent_no_longer_starting)
SSHAGENT="/usr/bin/ssh-agent"
SSHAGENTARGS="-s"
if [ -z "$SSH_AUTH_SOCK" -a -x "$SSHAGENT" ]; then
eval `$SSHAGENT $SSHAGENTARGS`
trap "kill $SSH_AGENT_PID" 0
fi
# Start the LXDE session # Start the LXDE session
exec /usr/bin/lxsession -s Lubuntu -e LXDE exec /usr/bin/lxsession -s Lubuntu -e LXDE

9
usr/bin/startlubuntu-netbook
View File

@ -76,5 +76,14 @@ if which gnome-keyring-daemon >/dev/null; then
export $(/usr/bin/gnome-keyring-daemon --start --components=ssh) export $(/usr/bin/gnome-keyring-daemon --start --components=ssh)
fi fi
# Start SSH agent, require since 3.5
# (see https://wiki.archlinux.org/index.php/Openbox#SSH_agent_no_longer_starting)
SSHAGENT="/usr/bin/ssh-agent"
SSHAGENTARGS="-s"
if [ -z "$SSH_AUTH_SOCK" -a -x "$SSHAGENT" ]; then
eval `$SSHAGENT $SSHAGENTARGS`
trap "kill $SSH_AGENT_PID" 0
fi
# Start the LXDE session # Start the LXDE session
exec /usr/bin/lxsession -s Lubuntu-Netbook -e LXDE exec /usr/bin/lxsession -s Lubuntu-Netbook -e LXDE