From 0606fa4a68fe76a91b2a91ee419746e19ecd5dad Mon Sep 17 00:00:00 2001
From: Julien Lavergne <gilir@ubuntu.com>
Date: Tue, 6 Nov 2012 21:30:32 +0100
Subject: [PATCH] Workaround ssh agent not autostarted properly.

---
 debian/changelog             | 1 +
 usr/bin/startlubuntu         | 9 +++++++++
 usr/bin/startlubuntu-netbook | 9 +++++++++
 3 files changed, 19 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index d0574de..7945692 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ lubuntu-default-settings (0.30) UNRELEASED; urgency=low
    - Use Ubuntu font in lxterminal.
   * usr/bin/startlubuntu*
    - Install the lxterminal configuration file. 
+   - Workaround ssh agent not autostarted properly.
   * usr/share/lubuntu/openbox/rc.xml
    - Add shortcuts for windows tiling (SuperKey + the direction).
    - Set drawContents to "no" on resize, to reduce the use of resize.
diff --git a/usr/bin/startlubuntu b/usr/bin/startlubuntu
index ef1baaf..7b6880b 100644
--- a/usr/bin/startlubuntu
+++ b/usr/bin/startlubuntu
@@ -76,5 +76,14 @@ if which gnome-keyring-daemon >/dev/null; then
        export $(/usr/bin/gnome-keyring-daemon --start --components=ssh)
 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
 exec /usr/bin/lxsession -s Lubuntu -e LXDE
diff --git a/usr/bin/startlubuntu-netbook b/usr/bin/startlubuntu-netbook
index d65f09e..15c5a09 100644
--- a/usr/bin/startlubuntu-netbook
+++ b/usr/bin/startlubuntu-netbook
@@ -76,5 +76,14 @@ if which gnome-keyring-daemon >/dev/null; then
        export $(/usr/bin/gnome-keyring-daemon --start --components=ssh)
 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
 exec /usr/bin/lxsession -s Lubuntu-Netbook -e LXDE