Dostosowanie skryptu do działania na zdalnych serwerach - przetestowano jego działanie.

diff --git a/tools/bin/immudex-kvm b/tools/bin/immudex-kvm
index c03935525bffb307af670e192de2991b2f97020a..8185287f4ae462671f963752064146fd02a337a7 100755 (executable)
--- a/tools/bin/immudex-kvm
+++ b/tools/bin/immudex-kvm
@@ -56,15 +56,26 @@ function immudex-kvm-list() {
   if [ "$1" ]; then
     case $1 in
       'vms') virsh -c $CONNECT list --all;;
-      'os-types') osinfo-query -f short-id,name os | grep "$2";;
-      'networks') sudo virsh net-list --all;;   
+      'os-types') if ! $(echo $CONNECT | grep -q 'ssh'); then 
+          osinfo-query -f short-id,name os | grep "$2";
+        else
+          KEYFILE=$(echo $CONNECT | cut -d "=" -f 2);
+          USER_HOSTNAME=$(echo $CONNECT | cut -d "/" -f 3 | cut -d ":" -f 1);
+          PORT=$(echo $CONNECT | egrep -o ":[0-9]+");
+          if [ "$KEYFILE" ]; then
+            ssh -p ${PORT:=22} -i $KEYFILE $USER_HOSTNAME "osinfo-query -f short-id,name os | grep \"$2\"";
+          else
+            ssh -p ${PORT:=22} $USER_HOSTNAME "osinfo-query -f short-id,name os | grep \"$2\"";
+          fi
+        fi;;
+      'networks') sudo virsh -c $CONNECT net-list --all;;   
       *) immudex-kvm-help;;
     esac
   fi
 }
 
 function immudex-kvm-create() {
-  virt-install --connect $CONNECT --name=$1 --vcpus=$3 --memory=$4 --cdrom=$5 --disk=${6},bus=sata,size=${7} --os-variant=$2
+  virt-install --connect $CONNECT --name=$1 --vcpus=$3 --memory=$4 --cdrom=$5 --disk=${6},bus=sata,size=${7} --graphics vnc --os-variant=$2
 }
 
 function immudex-kvm-import() {