summaryrefslogtreecommitdiffstats
path: root/remote/modules
diff options
context:
space:
mode:
authorSimon Rettberg2013-10-23 16:15:00 +0200
committerSimon Rettberg2013-10-23 16:15:00 +0200
commit8eff115d5deeda8d4fa2d7a1da162db55dcdcfdd (patch)
tree7aed4cac8ab75657b1dbb2b8ca184fa0636d33c6 /remote/modules
parent[rootfs-stage32] Run fdisk again after two seconds if it fails the first time (diff)
parent[printergui] Starts now tcpsvd and lpd directly (not via busybox). (diff)
downloadtm-scripts-8eff115d5deeda8d4fa2d7a1da162db55dcdcfdd.tar.gz
tm-scripts-8eff115d5deeda8d4fa2d7a1da162db55dcdcfdd.tar.xz
tm-scripts-8eff115d5deeda8d4fa2d7a1da162db55dcdcfdd.zip
Merge branch 'master' of simonslx:openslx-ng/tm-scripts
Diffstat (limited to 'remote/modules')
-rw-r--r--remote/modules/printergui/printergui.build1
-rwxr-xr-xremote/modules/vmchooser/data/opt/openslx/scripts/vmchooser-run_virt4
2 files changed, 3 insertions, 2 deletions
diff --git a/remote/modules/printergui/printergui.build b/remote/modules/printergui/printergui.build
index f6139ba6..3a0fd52b 100644
--- a/remote/modules/printergui/printergui.build
+++ b/remote/modules/printergui/printergui.build
@@ -15,5 +15,6 @@ build() {
make || perror "'make' failed."
}
post_copy() {
+ mkdir -p "${TARGET_BUILD_DIR}/var/spool/STANDARD"
chmod a+rwt "${TARGET_BUILD_DIR}/var/spool/STANDARD"
}
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 4a0ba8c6..9319c6c5 100755
--- a/remote/modules/vmchooser/data/opt/openslx/scripts/vmchooser-run_virt
+++ b/remote/modules/vmchooser/data/opt/openslx/scripts/vmchooser-run_virt
@@ -435,8 +435,8 @@ SPOOLDIR="/var/spool"
QUEUE="STANDARD"
# Start the lpdaemon listening on the given port
-busybox tcpsvd -E 0.0.0.0 5515 \
- busybox lpd "$SPOOLDIR" \
+tcpsvd -E 0.0.0.0 5515 \
+ lpd "$SPOOLDIR" \
sh -c "printergui $USER $SPOOLDIR/$QUEUE/\$DATAFILE" &
# PID to kill the process