update

roles/toxcore/tasks/main.yml

@@ -114,7 +114,7 @@
     df | grep /boot || mount /boot || exit 2
     [ -d /boot/grub ] || exit 3
     [ -f /boot/grub/grub.cfg ] || exit 4
-    [ -f /boot/grub/grub.cfg ] && cp -p /boot/grub/grub.cfg /boot/grub/grub.cfg.dst
+    [ -f /boot/grub/grub.cfg.dst ] || cp -p /boot/grub/grub.cfg /boot/grub/grub.cfg.dst
     sed -e 's@ ro *$@ '"$LINE"' ro@' -i /boot/grub/grub.cfg
   ignore_errors: true
 
@@ -284,7 +284,19 @@
     [ '{{BOX_NBD_OVERLAY_DIR}}' != '' ] || exit 2
     [ '{{BOX_NBD_BASE_PUBKEY}}' != '' ] || exit 3
     [ '{{BOX_NBD_BASE_QCOW}}' != '' ] || exit 4
-    [ -f '{{BOX_NBD_BASE_QCOW}}' ] || exit 5
+    [ '{{BOX_NBD_OVERLAY_RAM}}' != '' ] || exit 5
+    [ '{{BOX_NBD_OVERLAY_BR}}' != '' ] || exit 6
+    [ '{{BOX_NBD_OVERLAY_GB}}' != '' ] || exit 7
+    [ '{{BOX_NBD_OVERLAY_CPUS}}' != '' ] || exit 8
+    [ '{{BOX_NBD_OVERLAY_PASS}}' != '' ] || exit 9
+    if [ ! -f '{{BOX_NBD_BASE_QCOW}}' ] ; then
+        echo WARN: '{{BOX_NBD_BASE_QCOW}}' not built yet - skipping
+        exit 0
+    fi
+    if [ -z '{{BOX_NBD_BASE_PASS}}' ] ; then
+        echo WARN: 'BOX_NBD_BASE_PASS' empty
+        exit 10
+    fi
     toxcore_create-vm.bash \
              -n {{BOX_NBD_OVERLAY_NAME}} \
              -k {{BOX_NBD_BASE_PUBKEY}} \
@@ -293,8 +305,8 @@
              -c {{BOX_NBD_OVERLAY_CPUS}} \
              -r {{BOX_NBD_OVERLAY_RAM}} \
              -d {{BOX_NBD_OVERLAY_DIR}} \
-             -b virbr0 \
-             -p gentoo \
+             -b {{BOX_NBD_OVERLAY_BR}}  \
+             -p {{BOX_NBD_OVERLAY_PASS}} \
              -o gentoo
   ignore_errors: true
   when:

roles/toxcore/vars/Gentoo2.yml

@@ -40,7 +40,6 @@ toxcore_pkgs_inst:
   - dev-python/requests
   - gnome-base/dconf
   - net-libs/gtk-vnc
-  - net-misc/spice-gtk
   - sys-apps/dbus
   - x11-libs/gtk+
   - x11-libs/gtksourceview