From 2b0fdc40e076f46a2212f77a7d913042f1c8088d Mon Sep 17 00:00:00 2001
From: Silvio Rhatto <rhatto@riseup.net>
Date: Sun, 15 Jul 2018 15:52:28 -0300
Subject: Updates xrandr, net_dns and provision_command

---
 kvmx | 37 ++++++++++++++++++++++---------------
 1 file changed, 22 insertions(+), 15 deletions(-)

(limited to 'kvmx')

diff --git a/kvmx b/kvmx
index 079ea82..0c83fb9 100755
--- a/kvmx
+++ b/kvmx
@@ -1927,27 +1927,34 @@ function kvmx_xrandr {
     exit 1
   fi
 
-  local mode="`xrandr | grep '*+' | awk '{ print $1 }' | tr 'x' ' '`"
+  if [ "$ssh_support" != "y" ]; then
+    echo "$BASENAME: xrandr needs ssh_support config"
+    exit 1
+  fi
 
-  if [ ! -z "$resolution_y_offset" ]; then
-    local x="`echo $mode | awk '{ print $1 }'`"
-    local y="`echo $mode | awk '{ print $2 }'`"
+  if echo which xrandr | kvmx_ssh &> /dev/null; then
+    local mode="`xrandr | grep '*+' | awk '{ print $1 }' | tr 'x' ' '`"
 
-    mode="$x $(($y $resolution_y_offset))"
-  fi
+    if [ ! -z "$resolution_y_offset" ]; then
+      local x="`echo $mode | awk '{ print $1 }'`"
+      local y="`echo $mode | awk '{ print $2 }'`"
 
-  if [ -z "$xrandr_device" ]; then
-    xrandr_device="Virtual-0"
-  fi
+      mode="$x $(($y $resolution_y_offset))"
+    fi
+
+    if [ -z "$xrandr_device" ]; then
+      xrandr_device="Virtual-0"
+    fi
 
-  local line="`cvt $mode  | tail -1   | sed -e 's/^Modeline//'`"
-  local name="`echo $line | awk '{ print $1 }'`"
+    local line="`cvt $mode  | tail -1   | sed -e 's/^Modeline//'`"
+    local name="`echo $line | awk '{ print $1 }'`"
 
-  echo "Setting Modeline $line..."
+    echo "Setting Modeline $line..."
 
-  echo DISPLAY=:0 xrandr --newmode                       $line | kvmx_ssh
-  echo DISPLAY=:0 xrandr --addmode $xrandr_device        $name | kvmx_ssh
-  echo DISPLAY=:0 xrandr --output  $xrandr_device --mode $name | kvmx_ssh
+    echo DISPLAY=:0 xrandr --newmode                       $line | kvmx_ssh
+    echo DISPLAY=:0 xrandr --addmode $xrandr_device        $name | kvmx_ssh
+    echo DISPLAY=:0 xrandr --output  $xrandr_device --mode $name | kvmx_ssh
+  fi
 }
 
 # Wrapper to kvmx-create
-- 
cgit v1.2.3