From: LTSP Debian Maintainers <pkg-ltsp-devel@lists.alioth.debian.org>
Date: Thu, 27 Feb 2014 04:55:34 +0000 (+0000)
Subject: jetpipe-from-ltsp-client-core-init-script
X-Git-Tag: archive/raspbian/5.18.12-1+rpi1~1^2~1
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=3688e78b9369a2dfca63fa3e499e8f06cc94f95f;p=ltsp.git

jetpipe-from-ltsp-client-core-init-script

Start jetpipe from ltsp-client-core init script, as it fails to daemonize when
executed from init-ltsp.d, which is run before /sbin/init is started.


Gbp-Pq: Name jetpipe-from-ltsp-client-core-init-script
---

diff --git a/client/initscripts/ltsp-core b/client/initscripts/ltsp-core
index 936d9b5..3be5555 100755
--- a/client/initscripts/ltsp-core
+++ b/client/initscripts/ltsp-core
@@ -35,6 +35,33 @@ fi
 . /lib/lsb/init-functions
 . /usr/share/ltsp/ltsp-init-common
 
+start_printers() {
+for I in 0 1 2; do
+    eval PRINTER_DEVICE=\$\{PRINTER_${I}_DEVICE\}
+    if [ -n "${PRINTER_DEVICE}" ]; then
+        eval PORT=\$\{PRINTER_${I}_PORT:="910${I}"\} 
+        eval BAUD=\$\{PRINTER_${I}_SPEED:-"9600"\}
+        eval SIZE=\$\{PRINTER_${I}_DATABITS:-"8"\}
+        eval PARITY=\$\{PRINTER_${I}_PARITY:-"none"\}
+        eval FLOW=\$\{PRINTER_${I}_FLOWCTRL:-"soft"\}
+
+        JETPIPE_ARGS=
+        [ -n "$BAUD" ] && JETPIPE_ARGS="${JETPIPE_ARGS} -b ${BAUD}"
+        [ -n "$SIZE" ] && JETPIPE_ARGS="${JETPIPE_ARGS} -y ${SIZE}"
+        [ -n "$PARITY" ] && JETPIPE_ARGS="${JETPIPE_ARGS} -p ${PARITY}"
+        if [ -n "$FLOW" ]; then
+            if [ "$FLOW" = "soft" ]; then
+                JETPIPE_ARGS="${JETPIPE_ARGS} -x"  
+            else
+                JETPIPE_ARGS="${JETPIPE_ARGS} -r" 
+            fi
+        fi
+
+        /usr/sbin/jetpipe ${JETPIPE_ARGS} ${PRINTER_DEVICE} ${PORT}
+    fi
+done
+}
+
 case "$1" in
   start)
         log_action_begin_msg "Starting LTSP client..."
@@ -48,6 +75,7 @@ case "$1" in
             /bin/plymouth quit --retain-splash || true
         fi
 
+        start_printers || true
         start_screen_sessions || true
         start_sound || true
 
diff --git a/client/share/ltsp/init-ltsp.d/50-jetpipe b/client/share/ltsp/init-ltsp.d/50-jetpipe
deleted file mode 100644
index 8152011..0000000
--- a/client/share/ltsp/init-ltsp.d/50-jetpipe
+++ /dev/null
@@ -1,24 +0,0 @@
-for I in 0 1 2; do
-    eval PRINTER_DEVICE=\$\{PRINTER_${I}_DEVICE\}
-    if [ -n "${PRINTER_DEVICE}" ]; then
-        eval PORT=\$\{PRINTER_${I}_PORT:="910${I}"\} 
-        eval BAUD=\$\{PRINTER_${I}_SPEED:-"9600"\}
-        eval SIZE=\$\{PRINTER_${I}_DATABITS:-"8"\}
-        eval PARITY=\$\{PRINTER_${I}_PARITY:-"none"\}
-        eval FLOW=\$\{PRINTER_${I}_FLOWCTRL:-"soft"\}
-
-        JETPIPE_ARGS=
-        [ -n "$BAUD" ] && JETPIPE_ARGS="${JETPIPE_ARGS} -b ${BAUD}"
-        [ -n "$SIZE" ] && JETPIPE_ARGS="${JETPIPE_ARGS} -y ${SIZE}"
-        [ -n "$PARITY" ] && JETPIPE_ARGS="${JETPIPE_ARGS} -p ${PARITY}"
-        if [ -n "$FLOW" ]; then
-            if [ "$FLOW" = "soft" ]; then
-                JETPIPE_ARGS="${JETPIPE_ARGS} -x"  
-            else
-                JETPIPE_ARGS="${JETPIPE_ARGS} -r" 
-            fi
-        fi
-
-        /usr/sbin/jetpipe ${JETPIPE_ARGS} ${PRINTER_DEVICE} ${PORT} &
-    fi
-done