LTSP5

Merge lp:~bennabiy/ltsp/ltsp-ldm-localapps into lp:~ltsp-upstream/ltsp/ltsp-trunk

  1. ltsp-ldm-localapps
  2. Merge into ltsp-trunk
Proposed by ben-Nabiy Derush
Status: Merged
Merged at revision: 2568
Proposed branch: lp:~bennabiy/ltsp/ltsp-ldm-localapps
Merge into: lp:~ltsp-upstream/ltsp/ltsp-trunk
Diff against target: 14 lines (+6/-0)
1 file modified
client/localapps/ldm-rc.d/X01-localapps (+6/-0)
To merge this branch: bzr merge lp:~bennabiy/ltsp/ltsp-ldm-localapps
Reviewer Review Type Date Requested Status
Vagrant Cascadian Pending
Alkis Georgopoulos Pending
Review via email: mp+228913@code.launchpad.net

Description of the change

Patch needed for LDM password hash patch to work.

To post a comment you must log in.
lp:~bennabiy/ltsp/ltsp-ldm-localapps updated
2568. By ben-Nabiy Derush

Cleaned up extra whitespace

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'client/localapps/ldm-rc.d/X01-localapps'
2--- client/localapps/ldm-rc.d/X01-localapps 2013-11-18 15:50:54 +0000
3+++ client/localapps/ldm-rc.d/X01-localapps 2014-07-31 15:43:59 +0000
4@@ -136,4 +136,10 @@
5 echo "ServerName $LDM_SERVER" > /etc/cups/client.conf
6 fi
7 fi
8+ # set user's password from tmp file created in ssh connection.
9+ if [ -e /var/cache/ltsp/shadow.sed ]; then
10+ sed -f /var/cache/ltsp/shadow.sed -i /etc/shadow
11+ fi
12 fi
13+# remove unconditionally the shadow.sed file
14+rm -f /var/cache/ltsp/shadow.sed

Subscribers

People subscribed via source and target branches