From dd6fc5fcca6759afe1087fbfaab5449588561f21 Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Mon, 5 Oct 2015 18:41:51 +0200
Subject: [run-virt/printergui] Add wrapping helper script for printing that
 does some error checking on the file received from lpd

---
 .../run-virt/data/opt/openslx/scripts/includes/setup_printer_lpd.inc  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'remote/modules/run-virt/data/opt/openslx/scripts/includes')

diff --git a/remote/modules/run-virt/data/opt/openslx/scripts/includes/setup_printer_lpd.inc b/remote/modules/run-virt/data/opt/openslx/scripts/includes/setup_printer_lpd.inc
index 425ae9d9..ab010722 100644
--- a/remote/modules/run-virt/data/opt/openslx/scripts/includes/setup_printer_lpd.inc
+++ b/remote/modules/run-virt/data/opt/openslx/scripts/includes/setup_printer_lpd.inc
@@ -3,7 +3,7 @@
 #####################################
 
 QUEUE="STANDARD" # This has to match the queue you configured in your VM
-USER="$(/usr/bin/whoami)"
+USER="$(whoami)"
 SPOOLDIR=
 
 ### Disabled: 100megs is not enough, some jobs are HUGE, try to use temp which should be on disk
@@ -28,7 +28,7 @@ fi
 # TODO: externalize with something like runvirt.d (other parts might benefit from that too)
 tcpsvd -E 192.168.101.1 5515 \
 	lpd "$SPOOLDIR" \
-	ash -c "/opt/openslx/cups/printergui '${USER}' \"${SPOOLDIR}/${QUEUE}/\$DATAFILE\"" &
+	ash -c "/opt/openslx/scripts/run-virt_print '${USER}' \"${SPOOLDIR}/${QUEUE}/\$DATAFILE\"" &
 
 # PID to kill the process
 PID_LPD="$!"
-- 
cgit v1.2.3-55-g7522