diff options
| author | Simon Rettberg | 2013-10-18 17:52:39 +0200 |
|---|---|---|
| committer | Simon Rettberg | 2013-10-18 17:52:39 +0200 |
| commit | 37778435ca5ac1b4772b5d9a3c8e1c38245d899e (patch) | |
| tree | 91770bff0d77b962e9179e7fdbabec1e73a1013d /remote/modules/vmchooser | |
| parent | [stage4] Exclude vmware-tools from stage 4 until we get them to work properly (diff) | |
| parent | [printer] Fixed horrible typo (diff) | |
| download | tm-scripts-37778435ca5ac1b4772b5d9a3c8e1c38245d899e.tar.gz tm-scripts-37778435ca5ac1b4772b5d9a3c8e1c38245d899e.tar.xz tm-scripts-37778435ca5ac1b4772b5d9a3c8e1c38245d899e.zip | |
Merge branch 'master' of dnbd3:openslx-ng/tm-scripts
Diffstat (limited to 'remote/modules/vmchooser')
| -rwxr-xr-x | remote/modules/vmchooser/data/opt/openslx/scripts/vmchooser-run_virt | 10 |
1 files changed, 9 insertions, 1 deletions
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..4a0ba8c6 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" @@ -436,7 +437,10 @@ 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="$!" # Copy guest configuration (with added information) config.xml to be accessed @@ -527,5 +531,9 @@ if [ -n "${POSTRUN}" ]; then eval ${POSTRUN} >/dev/null 2>&1 fi +# Kill LPD +kill $PID_LPD + + cleanexit 0 exit 0 |