Merge lp:~stumbaumr/ltsp/ltsp into lp:~ltsp-upstream/ltsp/ltsp-trunk

[Rainer Stumbaum]

Added code for bug #1314201 Logging in LTSP startup

[lp:~stumbaumr/ltsp/ltsp]

2599. By Rainer Stumbaum on 2014-09-20

KIOSK_OPTIONS are passed on from the calling script, the variable itself is empty.
This is a quick fix - should be fixed properly...

[Vagrant Cascadian (vagrantc)]

Thanks for the patches!

The KIOSK_OPTIONS part in kioskSession is not be needed, it's handled by passing the environment variable in screen.d/kiosk to kioskSession in recent LTSP versions.

Regarding the logging, it would be better to have all the various logging functions in a function, which could include a conditional to enable/disable it. The conditional might be best as a bootprompt option, given that some of the logging happens before lts.conf is processed.

There are significant portions of the ltsp codebase which run in "set -e", and so unconditionally calling "logger" or writing to /dev/kmsg could actually result in unhandled errors, though a brief review of this particular code was not running under "set -e". Handling this in a function would also be cleaner.

review: Needs Fixing

[Alkis Georgopoulos (alkisg)]

I'm setting the state of old merge requests that have been stale for years, to rejected; if someone wants, he can do another merge request in git format, since now ltsp uses git.

review: Disapprove

Unmerged revisions

2599. By Rainer Stumbaum on 2014-09-20

KIOSK_OPTIONS are passed on from the calling script, the variable itself is empty.
This is a quick fix - should be fixed properly...

2598. By Rainer Stumbaum on 2014-09-19

Removed excessive logging

2597. By Rainer Stumbaum on 2014-09-19

Added logging code:
- where syslog is available using logger
- where syslog is not yet available using /dev/kmsg

=== modified file 'client/init-ltsp'
--- client/init-ltsp	2012-05-19 05:04:42 +0000
+++ client/init-ltsp	2014-09-20 00:26:57 +0000
@@ -1,4 +1,5 @@
 #!/bin/sh
+echo "LTSP: $0: Starting..." > /dev/kmsg
 
 . /usr/share/ltsp/ltsp-client-functions
 scriptsdir="/usr/share/ltsp/init-ltsp.d"
@@ -26,9 +27,9 @@
         warn "Continuing init-ltsp execution"
     fi
     debug "Sourcing $script"
+    echo "LTSP: $0: Sourcing $script" > /dev/kmsg
     . "$script"
 done
-
 debug "Done"
 
 # init=/sbin/init-ltsp can be used to launch this script, which should then
@@ -36,5 +37,6 @@
 # To run it from the initramfs instead, set the EXEC_INIT environment variable
 # to "false".
 if [ "$EXEC_INIT" != "false" ]; then
+    echo "LTSP: $0: Starting /sbin/init" > /dev/kmsg
     exec /sbin/init
 fi

=== modified file 'client/share/ltsp/init-ltsp.d/50-swap'
--- client/share/ltsp/init-ltsp.d/50-swap	2013-12-10 08:24:49 +0000
+++ client/share/ltsp/init-ltsp.d/50-swap	2014-09-20 00:26:57 +0000
@@ -3,6 +3,7 @@
     for part in `sfdisk -l 2>/dev/null | awk '/ 82 / { print $1}'`; do
         swap_devices="$swap_devices $part"
     done
+    echo "LTSP: $0: Found local swap partition $part" > /dev/kmsg
 fi
 
 # Set NBD_SWAP=true by default for clients with RAM < NBD_SWAP_THRESHOLD
@@ -55,5 +56,6 @@
         fi
         mkswap $swap
     fi
+    echo "LTSP: $0: Adding swap device $swap" > /dev/kmsg
     swapon $swap
 done

=== modified file 'client/share/ltsp/kioskSession'
--- client/share/ltsp/kioskSession	2012-06-08 23:59:36 +0000
+++ client/share/ltsp/kioskSession	2014-09-20 00:26:57 +0000
@@ -1,6 +1,8 @@
 #!/bin/sh
 
 KIOSK_EXE=$1
+shift
+KIOSK_OPTIONS="$*"
 KIOSKHOME=/usr/local/share/ltspkiosk/home
 KIOSKSTARTUP=/usr/local/share/ltspkiosk/startup
 

=== modified file 'client/share/ltsp/screen-session.d/XS90-assembleXorgConf'
--- client/share/ltsp/screen-session.d/XS90-assembleXorgConf	2008-12-31 21:21:50 +0000
+++ client/share/ltsp/screen-session.d/XS90-assembleXorgConf	2014-09-20 00:26:57 +0000
@@ -6,9 +6,11 @@
 if boolean_is_true "${CONFIGURE_X}"; then
     # Run custom command if supplied, otherwise use ours
     if [ -n "${CONFIGURE_X_COMMAND}" ] && [ -x "${CONFIGURE_X_COMMAND}" ]; then
+        logger -i -p syslog.info -t LTSP "$0: Running ${CONFIGURE_X_COMMAND}"
         ${CONFIGURE_X_COMMAND}
     else
         if [ -n "$screen_hacks" ] || [ -n "$monitor_hacks" ] || [ -n "$device_hacks" ] || [ -n "$module_hacks" ] || [ -n "$display_hacks" ]; then
+            logger -i -p syslog.info -t LTSP "$0: Writing ${XCONF} ( using $screen_hacks $monitor_hacks $device_hacks $module_hacks $display_hacks)"
             write_xorg_conf > ${XCONF} || true
         fi
     fi

=== modified file 'client/share/ltsp/screen.d/kiosk'
--- client/share/ltsp/screen.d/kiosk	2014-09-11 03:36:03 +0000
+++ client/share/ltsp/screen.d/kiosk	2014-09-20 00:26:57 +0000
@@ -49,6 +49,7 @@
 # Edit passwd homedir entry for programs that look it up from there
 sed -i -e '\|'${KIOSKUSER}'|s|[^:]*\(:[^:]*\)$|'$TMPDIR'\1|' /etc/passwd
 
-su - ${KIOSKUSER} -c "XINITRC_DAEMON=${XINITRC_DAEMON} KIOSK_WM=${KIOSK_WM} KIOSK_OPTIONS=${KIOSK_OPTIONS} xinit $xinitrc /usr/share/ltsp/kioskSession ${KIOSK_EXE} -- ${DISPLAY} vt${TTY} -nolisten tcp ${X_ARGS} -br" >/dev/null
+logger -i -p syslog.info -t LTSP "$0: Running su - ${KIOSKUSER} -c \"XINITRC_DAEMON=${XINITRC_DAEMON} KIOSK_WM=${KIOSK_WM} KIOSK_OPTIONS=${KIOSK_OPTIONS} xinit $xinitrc /usr/share/ltsp/kioskSession ${KIOSK_EXE} -- ${DISPLAY} vt${TTY} -nolisten tcp ${X_ARGS} -br\""
+su - ${KIOSKUSER} -c "XINITRC_DAEMON=${XINITRC_DAEMON} KIOSK_WM=${KIOSK_WM} KIOSK_OPTIONS=${KIOSK_OPTIONS} xinit $xinitrc /usr/share/ltsp/kioskSession ${KIOSK_EXE} -- ${DISPLAY} vt${TTY} -nolisten tcp ${X_ARGS} -br" 2>&1 | logger -i -p syslog.info -t LTSP
 
 rm -rf ${TMPDIR}

=== modified file 'client/share/ltsp/screen_session'
--- client/share/ltsp/screen_session	2013-01-08 18:33:21 +0000
+++ client/share/ltsp/screen_session	2014-09-20 00:26:57 +0000
@@ -73,10 +73,13 @@
     fi
 
     for script in $(run_parts_list /usr/share/ltsp/screen-session.d/ S); do
+        logger -i -p syslog.info -t LTSP "$0: Sourcing $script"
         . "$script"
     done
+    logger -i -p syslog.info -t LTSP "$0: Running $script_path $args"
     "$script_path" "$args"
     for script in $(run_parts_list /usr/share/ltsp/screen-session.d/ K); do
+        logger -i -p syslog.info -t LTSP "$0: Sourcing $script"
         . "$script"
     done
 done