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

* usr/bin/start*

Browse Source 
- Remove gnome-keyring workaround, since we have the proper fix for ssh.
This commit is contained in:
Julien Lavergne 2013-03-16 10:38:13 +01:00
parent 1018842fe8
commit ae60fe635f
5 changed files with 7 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
debian/changelog vendored
View File

@ -1,3 +1,10 @@
lubuntu-default-settings (0.32) UNRELEASED; urgency=low
* usr/bin/start*
- Remove gnome-keyring workaround, since we have the proper fix for ssh.
-- Julien Lavergne <gilir@ubuntu.com> Sat, 16 Mar 2013 10:37:20 +0100
lubuntu-default-settings (0.31) raring; urgency=low lubuntu-default-settings (0.31) raring; urgency=low
* Add a new Lubuntu-Nexus7 session. * Add a new Lubuntu-Nexus7 session.

6
usr/bin/startlubuntu
View File

@ -70,12 +70,6 @@ if which dbus-launch >/dev/null && test -z "$DBUS_SESSION_BUS_ADDRESS"; then
eval "$(dbus-launch --sh-syntax --exit-with-session)" eval "$(dbus-launch --sh-syntax --exit-with-session)"
fi fi
# Export Gnome-keyring variables if needed
# See bug #664206
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 # Start SSH agent, require since 3.5
# (see https://wiki.archlinux.org/index.php/Openbox#SSH_agent_no_longer_starting) # (see https://wiki.archlinux.org/index.php/Openbox#SSH_agent_no_longer_starting)
SSHAGENT="/usr/bin/ssh-agent" SSHAGENT="/usr/bin/ssh-agent"

6
usr/bin/startlubuntu-lxgames
View File

@ -70,12 +70,6 @@ if which dbus-launch >/dev/null && test -z "$DBUS_SESSION_BUS_ADDRESS"; then
eval "$(dbus-launch --sh-syntax --exit-with-session)" eval "$(dbus-launch --sh-syntax --exit-with-session)"
fi fi
# Export Gnome-keyring variables if needed
# See bug #664206
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 # Start SSH agent, require since 3.5
# (see https://wiki.archlinux.org/index.php/Openbox#SSH_agent_no_longer_starting) # (see https://wiki.archlinux.org/index.php/Openbox#SSH_agent_no_longer_starting)
SSHAGENT="/usr/bin/ssh-agent" SSHAGENT="/usr/bin/ssh-agent"

6
usr/bin/startlubuntu-netbook
View File

@ -70,12 +70,6 @@ if which dbus-launch >/dev/null && test -z "$DBUS_SESSION_BUS_ADDRESS"; then
eval "$(dbus-launch --sh-syntax --exit-with-session)" eval "$(dbus-launch --sh-syntax --exit-with-session)"
fi fi
# Export Gnome-keyring variables if needed
# See bug #664206
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 # Start SSH agent, require since 3.5
# (see https://wiki.archlinux.org/index.php/Openbox#SSH_agent_no_longer_starting) # (see https://wiki.archlinux.org/index.php/Openbox#SSH_agent_no_longer_starting)
SSHAGENT="/usr/bin/ssh-agent" SSHAGENT="/usr/bin/ssh-agent"

6
usr/bin/startlubuntu-nexus7
View File

@ -71,12 +71,6 @@ if which dbus-launch >/dev/null && test -z "$DBUS_SESSION_BUS_ADDRESS"; then
eval "$(dbus-launch --sh-syntax --exit-with-session)" eval "$(dbus-launch --sh-syntax --exit-with-session)"
fi fi
# Export Gnome-keyring variables if needed
# See bug #664206
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 # Start SSH agent, require since 3.5
# (see https://wiki.archlinux.org/index.php/Openbox#SSH_agent_no_longer_starting) # (see https://wiki.archlinux.org/index.php/Openbox#SSH_agent_no_longer_starting)
SSHAGENT="/usr/bin/ssh-agent" SSHAGENT="/usr/bin/ssh-agent"