various updates v.dev3

packaging/build.sh

@@ -11,5 +11,5 @@ sed -e "s%\.\./\.\.%$PWD%" -i ../docs/source/conf.py
 dh_make --copyright gpl3 --yes --python --file ../compute-*[.tar.gz]
 rm debian/*.ex debian/README.{Debian,source} debian/*.docs
 sed -e 's/\* Initial release.*/\* This is the development build, see commits in upstream repo for info./' -i debian/changelog
-cp -v ../../files/{control,rules,copyright,docs,compute.bash-completion} debian/
+cp -v ../../files/{control,rules,copyright,docs,compute.bash-completion,install} debian/
 dpkg-buildpackage -us -uc

packaging/files/compute.bash-completion

@@ -1,13 +1,13 @@
 # compute bash completion script
 
+_compute_global_opts="--connect --log-level"
 _compute_root_cmd="
+    $_compute_global_opts
     --version
-    --verbose
-    --connect
-    --log-level
     init
     exec
     ls
+    lsdisks
     start
     shutdown
     reboot
@@ -20,23 +20,34 @@ _compute_root_cmd="
     setmem
     setpass
     setcdrom
+    setcloudinit
     delete"
-_compute_init_opts="--test --start"
-_compute_exec_opts="--timeout --executable --env --no-join-args"
-_compute_ls_opts=""
-_compute_start_opts=""
-_compute_shutdown_opts="--soft --normal --hard --unsafe"
-_compute_reboot_opts=""
-_compute_reset_opts=""
-_compute_powrst_opts=""
-_compute_pause_opts=""
-_compute_resume_opts=""
-_compute_status_opts=""
-_compute_setvcpus_opts=""
-_compute_setmem_opts=""
-_compute_setpass_opts="--encrypted"
-_compute_setcdrom_opts="--detach"
-_compute_delete_opts="--yes --save-volumes"
+_compute_init_opts="$_compute_global_opts --test --start"
+_compute_exec_opts="$_compute_global_opts
+    --timeout
+    --executable
+    --env
+    --no-join-args"
+_compute_ls_opts="$_compute_global_opts"
+_compute_lsdisks_opts="$_compute_global_opts --persistent"
+_compute_start_opts="$_compute_global_opts"
+_compute_shutdown_opts="$_compute_global_opts --soft --normal --hard --unsafe"
+_compute_reboot_opts="$_compute_global_opts"
+_compute_reset_opts="$_compute_global_opts"
+_compute_powrst_opts="$_compute_global_opts"
+_compute_pause_opts="$_compute_global_opts"
+_compute_resume_opts="$_compute_global_opts"
+_compute_status_opts="$_compute_global_opts"
+_compute_setvcpus_opts="$_compute_global_opts"
+_compute_setmem_opts="$_compute_global_opts"
+_compute_setpass_opts="$_compute_global_opts --encrypted"
+_compute_setcdrom_opts="$_compute_global_opts --detach"
+_compute_setcloudinit_opts="$_compute_global_opts
+    --user-data
+    --vendor-data
+    --meta-data
+    --network-config"
+_compute_delete_opts="$_compute_global_opts --yes --save-volumes"
 
 _compute_complete_instances()
 {
@@ -49,12 +60,19 @@ _compute_complete_instances()
 
 _compute_compreply()
 {
+    local cgopts=
+
+    if [[ "$1" == '-f' ]]; then
+        cgopts="-f"
+        shift
+    fi
+
     if [[ "$current" = [a-z]* ]]; then
         _compute_compwords="$(_compute_complete_instances)"
     else
         _compute_compwords="$*"
     fi
-    COMPREPLY=($(compgen -W "$_compute_compwords" -- "$current"))
+    COMPREPLY=($(compgen $cgopts -W "$_compute_compwords" -- "$current"))
 }
 
 _compute_complete()
@@ -68,9 +86,10 @@ _compute_complete()
             nshift=$((COMP_CWORD-1))
             previous="${COMP_WORDS[COMP_CWORD-nshift]}"
             case "$previous" in
-                init) COMPREPLY=($(compgen -f -- "$current"));;
+                init) COMPREPLY=($(compgen -f -W "$_compute_init_opts" -- "$current"));;
                 exec) _compute_compreply "$_compute_exec_opts";;
                 ls) COMPREPLY=($(compgen -W "$_compute_ls_opts" -- "$current"));;
+                lsdisks) _compute_compreply "$_compute_lsdisks_opts";;
                 start) _compute_compreply "$_compute_start_opts";;
                 shutdown) _compute_compreply "$_compute_shutdown_opts";;
                 reboot) _compute_compreply "$_compute_reboot_opts";;
@@ -83,6 +102,7 @@ _compute_complete()
                 setmem) _compute_compreply "$_compute_setmem_opts";;
                 setpass) _compute_compreply "$_compute_setpass_opts";;
                 setcdrom) _compute_compreply "$_compute_setcdrom_opts";;
+                setcloudinit) _compute_compreply -f "$_compute_setcloudinit_opts";;
                 delete) _compute_compreply "$_compute_delete_opts";;
                 *) COMPREPLY=()
             esac

packaging/files/control

@@ -33,12 +33,14 @@ Depends:
  python3-libvirt,
  python3-lxml,
  python3-yaml,
- python3-pydantic
+ python3-pydantic,
+ mtools,
+ dosfstools
 Recommends:
  dnsmasq
 Suggests:
  compute-doc
-Description: Compute instances management library and tools (Python 3)
+Description: Compute instances management library (Python 3)
 
 Package: compute-doc
 Section: doc
@@ -46,4 +48,4 @@ Architecture: all
 Depends:
  ${sphinxdoc:Depends},
  ${misc:Depends},
-Description: Compute instances management library and tools (documentation)
+Description: Compute instances management library (documentation)

packaging/files/install

@@ -0,0 +1 @@
+computed.toml etc/compute/