Merge lp:~jonathan/ubuntu/quantal/ltsp/autologin into lp:ubuntu/quantal/ltsp

Proposed by Jonathan Carter
Status: Merged
Merge reported by: Stéphane Graber
Merged at revision: not available
Proposed branch: lp:~jonathan/ubuntu/quantal/ltsp/autologin
Merge into: lp:ubuntu/quantal/ltsp
Diff against target: 25 lines (+7/-0)
2 files modified
debian/changelog (+6/-0)
debian/scripts/ltsp-live (+1/-0)
To merge this branch: bzr merge lp:~jonathan/ubuntu/quantal/ltsp/autologin
Reviewer Review Type Date Requested Status
Stéphane Graber Pending
Review via email: mp+107682@code.launchpad.net
To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'debian/changelog'
--- debian/changelog 2012-04-10 08:16:54 +0000
+++ debian/changelog 2012-05-28 19:31:20 +0000
@@ -1,3 +1,9 @@
1ltsp (5.3.7-0ubuntu3) quantal; urgency=low
2
3 * Make ltsp-live use auto-login
4
5 -- Jonathan Carter <jonathan@ubuntu.com> Mon, 28 May 2012 15:10:11 -0400
6
1ltsp (5.3.7-0ubuntu2) precise; urgency=low7ltsp (5.3.7-0ubuntu2) precise; urgency=low
28
3 * Fix ltsp-client-vendor-functions symlink by replacing it by the actual9 * Fix ltsp-client-vendor-functions symlink by replacing it by the actual
410
=== modified file 'debian/scripts/ltsp-live'
--- debian/scripts/ltsp-live 2012-02-27 19:38:02 +0000
+++ debian/scripts/ltsp-live 2012-05-28 19:31:20 +0000
@@ -150,6 +150,7 @@
150LDM_DIRECTX=True150LDM_DIRECTX=True
151LDM_SSHOPTIONS="-o StrictHostKeyChecking=no -o CheckHostIP=no -o LogLevel=silent"151LDM_SSHOPTIONS="-o StrictHostKeyChecking=no -o CheckHostIP=no -o LogLevel=silent"
152LDM_GUESTLOGIN=True152LDM_GUESTLOGIN=True
153LDM_AUTOLOGIN=True
153LANG=en_US.UTF-8154LANG=en_US.UTF-8
154LANGUAGE=%s155LANGUAGE=%s
155LDM_LANGUAGE=%s156LDM_LANGUAGE=%s

Subscribers

People subscribed via source and target branches