LDM libdir/libexecdir merge request, other fixes
Affects | Status | Importance | Assigned to | Milestone | |
---|---|---|---|---|---|
LTSP5 |
Fix Released
|
Undecided
|
Unassigned |
Bug Description
Please merge https:/
List of changes, grouped:
---
gcc warning fixes and whitespace removal:
commit b6ad7db3d2a8c5d
Author: Kim B. Heino <email address hidden>
Date: Fri Jun 16 16:32:13 2017 +0300
ssh: fix logging error and two gcc warnings
commit a0612211faa5069
Author: Kim B. Heino <email address hidden>
Date: Fri Jun 16 16:31:38 2017 +0300
ssh: remove trailing whitespaces
commit 8da40c8a2dd516e
Author: Kim B. Heino <email address hidden>
Date: Fri Jun 16 16:30:25 2017 +0300
greeter: fix gcc warning
commit c2baad2e15f9130
Author: Kim B. Heino <email address hidden>
Date: Fri Jun 16 16:30:00 2017 +0300
ldmutils: fix gcc warning
commit 57949728e8ff064
Author: Kim B. Heino <email address hidden>
Date: Fri Jun 16 16:51:35 2017 +0300
ldm: g_type_init is deprecated in new glib
---
Flush log file, simple fix:
commit 26bdf33864472ab
Author: Kim B. Heino <email address hidden>
Date: Fri Jun 16 16:27:29 2017 +0300
logging: flush log file after each write
Debugging ldm crash was quite hard when log file was missing last lines.
Logging is quite minimal so flushing it after each line does no harm.
---
nc will hang forever waiting for eof if stdin is not devnull or similar file. Make sure it is. This is needed in rhel7. Maybe change to socat instead of nc in future?
commit cabcd37a9354e59
Author: Kim B. Heino <email address hidden>
Date: Fri Jun 16 16:38:05 2017 +0300
screen.d/ldm: make sure nc's input is null, hide "Connection refused" error
---
This is bigger/important fix. In src/plugins/ Makefile you use libdir for *.so (as you should), but in top level src/ Makefile you use libexecdir for same *.so files. Result is that ldm searches plugins from wrong directory. Fix top level Makefile to use libdir for plugins.
I think at least Debian has libdir == libexecdir, so this has no change there. In rhel7 this is important fix as libdir != libexecdir.
commit 4485221eb6714dd
Author: Kim B. Heino <email address hidden>
Date: Fri Jun 16 16:33:33 2017 +0300
Makefile: use same ldmplugdir value as in src/plugins/
In RHEL7 plugins are installed to /usr/lib64/ldm (libdir/ldm) and
executables to /usr/libexec/ldm (libexecdir/ldm).
Changed in ltsp: | |
status: | Fix Committed → Fix Released |
Thanks for the patches!
Merged:
https:/ /git.launchpad. net/~ltsp- upstream/ ltsp/+git/ ldm/commit/ ?id=ab50662d2f0 1b271ae101f48e1 a3a0477d05511b