From 00414cbbf3934cb0fa40bcaf6ac25fe67d2e86c9 Mon Sep 17 00:00:00 2001
From: Manuel Schneider
Date: Fri, 18 Oct 2013 16:27:44 +0200
Subject: [cups] Kill LPD when run_virt finishes

---
 .../modules/vmchooser/data/opt/openslx/scripts/vmchooser-run_virt | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'remote/modules/vmchooser/data')

diff --git a/remote/modules/vmchooser/data/opt/openslx/scripts/vmchooser-run_virt b/remote/modules/vmchooser/data/opt/openslx/scripts/vmchooser-run_virt
index 261ef8f5..81f8c2e1 100755
--- a/remote/modules/vmchooser/data/opt/openslx/scripts/vmchooser-run_virt
+++ b/remote/modules/vmchooser/data/opt/openslx/scripts/vmchooser-run_virt
@@ -428,6 +428,7 @@ if [ "$vtflag" = "1" -a -n "$kvm_module" ]; then
 	modprobe "$kvm_module"
 fi
 
+
 # # # # # # Start printer daemon # # # # # # # 
 USER="$(whoami)"
 SPOOLDIR="/var/spool"
@@ -438,6 +439,9 @@ busybox tcpsvd -E 0.0.0.0 5515 \
   busybox lpd "$SPOOLDIR" \
   sh -c "printergui $USER $SPOOOLDIR/$QUEUE/\$DATAFILE" &
 
+# PID to kill the process
+PID_LPD="$!"
+
 
 # Copy guest configuration (with added information) config.xml to be accessed
 # via virtual floppy
@@ -527,5 +531,9 @@ if [ -n "${POSTRUN}" ]; then
 	eval ${POSTRUN} >/dev/null 2>&1
 fi
 
+# Kill LPD
+kill $PID_LPD
+
+
 cleanexit 0
 exit 0
-- 
cgit v1.2.3-55-g7522


From 3456c9ba1c9b6f2b47cf6de26d14af57f3b593b4 Mon Sep 17 00:00:00 2001
From: Manuel Schneider
Date: Fri, 18 Oct 2013 17:19:38 +0200
Subject: [printer] Fixed horrible typo

---
 remote/modules/vmchooser/data/opt/openslx/scripts/vmchooser-run_virt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'remote/modules/vmchooser/data')

diff --git a/remote/modules/vmchooser/data/opt/openslx/scripts/vmchooser-run_virt b/remote/modules/vmchooser/data/opt/openslx/scripts/vmchooser-run_virt
index 81f8c2e1..4a0ba8c6 100755
--- a/remote/modules/vmchooser/data/opt/openslx/scripts/vmchooser-run_virt
+++ b/remote/modules/vmchooser/data/opt/openslx/scripts/vmchooser-run_virt
@@ -437,7 +437,7 @@ QUEUE="STANDARD"
 # Start the lpdaemon listening on the given port
 busybox tcpsvd -E 0.0.0.0 5515 \
   busybox lpd "$SPOOLDIR" \
-  sh -c "printergui $USER $SPOOOLDIR/$QUEUE/\$DATAFILE" &
+  sh -c "printergui $USER $SPOOLDIR/$QUEUE/\$DATAFILE" &
 
 # PID to kill the process
 PID_LPD="$!"
-- 
cgit v1.2.3-55-g7522