From 5782e506c590b39c57c92071e4dc59c9bb277044 Mon Sep 17 00:00:00 2001
From: Maxim Razumeyko <max@senta.pro>
Date: Tue, 21 May 2024 00:12:19 +0300
Subject: [PATCH] Update vm-core to support vm description

Add vm description support in vm configuration files
---
 lib/vm-core | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/lib/vm-core b/lib/vm-core
index 20975db5..b56752a0 100644
--- a/lib/vm-core
+++ b/lib/vm-core
@@ -32,7 +32,7 @@ core::list(){
     local _name _loader _cpu _our_host
     local _memory _run _vm _auto _num _vnc _pid
     local _state _pcpu _rss _uptime
-    local _format="%s^%s^%s^%s^%s^%s^%s^%s\n"
+    local _format="%s^%s^%s^%s^%s^%s^%s^%s^%s\n"
 
     while getopts r _opt ; do
         case $_opt in
@@ -48,14 +48,14 @@ core::list(){
 
     vm::running_load
 
-    [ -n "${VM_OPT_VERBOSE}" ] && _format="%s^%s^%s^%s^%s^%s^%s^%5s^%8s^%14s^%s\n";
+    [ -n "${VM_OPT_VERBOSE}" ] && _format="%s^%s^%s^%s^%s^%s^%s^%5s^%8s^%14s^%s^%s\n";
 
     # pass everything below here to column(1)
     {
         if [ -n "${VM_OPT_VERBOSE}" ]; then
-            printf "${_format}" "NAME" "DATASTORE" "LOADER" "CPU" "MEMORY" "VNC" "AUTO" "%CPU" "RSZ" "UPTIME" "STATE"
+            printf "${_format}" "NAME" "DATASTORE" "LOADER" "CPU" "MEMORY" "VNC" "AUTO" "%CPU" "RSZ" "UPTIME" "STATE" "DESCRIPTION"
         else
-            printf "${_format}" "NAME" "DATASTORE" "LOADER" "CPU" "MEMORY" "VNC" "AUTO" "STATE"
+            printf "${_format}" "NAME" "DATASTORE" "LOADER" "CPU" "MEMORY" "VNC" "AUTO" "STATE" "DESCRIPTION"
         fi
 
         for _ds in ${VM_DATASTORE_LIST}; do
@@ -67,6 +67,7 @@ core::list(){
 
                 config::load "${VM_DS_PATH}/${_name}/${_name}.conf"
                 config::get "_loader" "loader" "none"
+                config::get "_descr" "description" ""
                 config::get "_cpu" "cpu"
                 config::get "_memory" "memory"
 
@@ -122,9 +123,9 @@ core::list(){
                 fi
 
                 if [ -n "${VM_OPT_VERBOSE}" ]; then
-                    printf "${_format}" "${_name}" "${_ds}" "${_loader}" "${_cpu}" "${_memory}" "${_vnc}" "${_auto}" "${_pcpu}" "${_rss}" "${_uptime}" "${_run}"
+                    printf "${_format}" "${_name}" "${_ds}" "${_loader}" "${_cpu}" "${_memory}" "${_vnc}" "${_auto}" "${_pcpu}" "${_rss}" "${_uptime}" "${_run}" "${_descr}"
                 else
-                    printf "${_format}" "${_name}" "${_ds}" "${_loader}" "${_cpu}" "${_memory}" "${_vnc}" "${_auto}" "${_run}"
+                    printf "${_format}" "${_name}" "${_ds}" "${_loader}" "${_cpu}" "${_memory}" "${_vnc}" "${_auto}" "${_run}" "${_descr}"
                 fi
             done
         done