From: Silvio Rhatto <rhatto@riseup.net>
Date: Sun, 31 Dec 2017 18:45:59 +0000 (-0200)
Subject: Minor kvmx-supervise fixes
X-Git-Tag: 0.1.0~288
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=7c09b537bfee67d293785f0e5a2b564f890a1600;p=kvmx.git

Minor kvmx-supervise fixes
---

diff --git a/kvmx-supervise b/kvmx-supervise
index b7f9e7f..41f4990 100755
--- a/kvmx-supervise
+++ b/kvmx-supervise
@@ -21,7 +21,6 @@
 # Parameters
 BASENAME="`basename $0`"
 DIRNAME="`dirname $0`"
-GLOBAL_USER_CONFIG_FILE="$HOME/.config/kvmxconfig"
 INSTANCES="`ls -1 /home/*/.config/kvmx/*`"
 ACTION="$1"
 
@@ -83,11 +82,12 @@ function kvmx_supervise_call {
   fi
 
   # Operate only with VMs configured with supervise_manage=1
-  supervise="`su $user -c "kvmx config supervise_manage"`"
+  # Specify /bin/bash to avoid restricted shells like kvmx-shell
+  supervise="`su $user -s /bin/bash -c "kvmx config supervise_manage"`"
 
   # Dispatch
   if [ "$supervise_manage" == "1" ]; then
-    su $user -c "kvmx $vm $*"
+    su $user -s /bin/bash -c "kvmx $vm $*"
   fi
 }
 
@@ -128,6 +128,7 @@ function kvmx_supervise_restart {
 if type kvmx_supervise_$ACTION 2> /dev/null | grep -q "kvmx_supervise_$ACTION ()"; then
   __kvmx_supervise_initialize $*
 
+  shift
   kvmx_supervise_$ACTION $*
 else
   kvmx_supervise_usage