aboutsummaryrefslogtreecommitdiff
path: root/kvmx
diff options
context:
space:
mode:
authorSilvio Rhatto <rhatto@riseup.net>2018-06-17 13:31:50 -0300
committerSilvio Rhatto <rhatto@riseup.net>2018-06-17 13:31:50 -0300
commit7eeb6729fd30b3c1c3c8053f63cefee2c75caa25 (patch)
treed43540698f21543d6ec3053efeca2cf0ccfb1c46 /kvmx
parent127682c4e6f24124583f2df26a70cc679d5cb0d7 (diff)
downloadkvmx-7eeb6729fd30b3c1c3c8053f63cefee2c75caa25.tar.gz
kvmx-7eeb6729fd30b3c1c3c8053f63cefee2c75caa25.tar.bz2
Remove old nohup/disown code from kvmx shell since qemu is now immune to hangups
Diffstat (limited to 'kvmx')
-rwxr-xr-xkvmx42
1 files changed, 0 insertions, 42 deletions
diff --git a/kvmx b/kvmx
index 8acd1b2..2dc982a 100755
--- a/kvmx
+++ b/kvmx
@@ -1793,7 +1793,6 @@ function kvmx_version {
# Shell
function kvmx_shell {
- #local tail=""
local restricted="$1"
local restricted_actions=":status:start:stop:poweroff:suspend:resume:console:monitor"
restricted_actions="$restricted_actions:wipe:shred:app_base:version:list_image:kill:"
@@ -1816,54 +1815,13 @@ function kvmx_shell {
echo "Running in restricted shell mode."
echo "Allowed commands are only `echo $restricted_actions | tr ':' ' '`"
else
- #if [ "${STDIN[0]}" == "up" ] || [ "${STDIN[0]}" == "start" ] || [ "${STDIN[0]}" == "restart" ]; then
- # # Process command, nohup version, stdout and stderr are redirected to a file
- # #nohup $APP_BASE/kvmx ${STDIN[0]} $VM ${STDIN[@]:1} < /dev/null >> $LOG_DIR/nohup 2>&1 &
-
- # # Process command, disown version, stdout are preserved
- # #$APP_BASE/kvmx ${STDIN[0]} $VM ${STDIN[@]:1} &
- # $APP_BASE/kvmx ${STDIN[0]} $VM ${STDIN[@]:1} < /dev/null >> $LOG_DIR/nohup 2>&1 &
- # disown -h
-
- # sleep 1
- # if [ -e "$LOG_DIR/nohup" ] && [ -z "$tail" ]; then
- # tail -F $LOG_DIR/nohup &
- # tail="$1"
- # fi
- # sleep 1
- #else
- # $APP_BASE/kvmx ${STDIN[0]} $VM ${STDIN[@]:1}
- #fi
$APP_BASE/kvmx ${STDIN[0]} $VM ${STDIN[@]:1}
fi
else
- #if [ "${STDIN[0]}" == "up" ] || [ "${STDIN[0]}" == "start" ] || [ "${STDIN[0]}" == "restart" ]; then
- # # Process command, nohup version
- # #nohup $APP_BASE/kvmx ${STDIN[0]} $VM ${STDIN[@]:1} < /dev/null >> $LOG_DIR/nohup 2>&1 &
-
- # # Process command, disown version
- # #$APP_BASE/kvmx ${STDIN[0]} $VM ${STDIN[@]:1} &
- # $APP_BASE/kvmx ${STDIN[0]} $VM ${STDIN[@]:1} < /dev/null >> $LOG_DIR/nohup 2>&1 &
- # disown -h
-
- # sleep 1
- # if [ -e "$LOG_DIR/nohup" ] && [ -z "$tail" ]; then
- # tail -F $LOG_DIR/nohup &
- # tail="$1"
- # fi
- # sleep 1
- #else
- # $APP_BASE/kvmx ${STDIN[0]} $VM ${STDIN[@]:1}
- #fi
$APP_BASE/kvmx ${STDIN[0]} $VM ${STDIN[@]:1}
fi
fi
done
-
- #if [ ! -z "$tail" ]; then
- # kill $tail &> /dev/null
- # #rm -f $LOG_DIR/nohup
- #fi
}
# Xrandr integration