software/kvm: Decolorize output of qmprestore/qmpbackup

Put the decolorization directly in the generated binary.

software/kvm/buildout.hash.cfg

@@ -15,7 +15,7 @@
 
 [template]
 filename = instance.cfg.in
-md5sum = bf0a70140e4775efaacdd5fe03ac3b62
+md5sum = 2ef12d7fc16d74e0887a8cb16a848445
 
 [template-kvm]
 filename = instance-kvm.cfg.jinja2
@@ -43,7 +43,7 @@ md5sum = a02f0694dcb944c18d99f7f79afa2384
 
 [template-kvm-export-script]
 filename = template/kvm-export.sh.jinja2
-md5sum = ba1e0359178925788792a1c6cc29ba59
+md5sum = 667e4668cfdf396d18785d8cfa096396
 
 [template-nginx]
 filename = template/nginx_conf.in

software/kvm/instance.cfg.in

@@ -126,6 +126,7 @@ import-list = file parts :template-parts-destination
 recipe = slapos.cookbook:wrapper
 environment =
   PATH=${qemu:location}/bin
+  NO_COLOR=true
 wrapper-path =
   $${buildout:bin-directory}/qmpbackup
 command-line =
@@ -150,6 +151,7 @@ context =
 recipe = slapos.cookbook:wrapper
 environment =
   PATH=${qemu:location}/bin
+  NO_COLOR=true
 wrapper-path =
   $${buildout:bin-directory}/qmprestore
 command-line =

software/kvm/template/kvm-export.sh.jinja2

@@ -6,9 +6,6 @@ set -e
 LC_ALL=C
 export LC_ALL
 BACKUP_DIR={{ directory['backup'] }}
-# decolorize colorlog in qmpbackup
-NO_COLOR=true
-export NO_COLOR
 
 log=$(mktemp --tmpdir={{ directory['tmp'] }})
 trap "rm -f $log" EXIT TERM INT