software/kvm: Reuse disk-image-corruption template

software/kvm/buildout.hash.cfg

@@ -15,7 +15,7 @@
 
 [template]
 filename = instance.cfg.in
-md5sum = 5eccc2e9f207399cbeac762dce32dd7c
+md5sum = 7f357b3ec6763d6a5e084fc460223e4c
 
 [template-kvm]
 filename = instance-kvm.cfg.jinja2
@@ -31,7 +31,7 @@ md5sum = 12d46a7d45f00e091d18e6d4552d0973
 
 [template-kvm-import]
 filename = instance-kvm-import.cfg.jinja2.in
-md5sum = e39ebf2a6db9ea7187df8cebcb87711a
+md5sum = 022438f445e9ae5b1930a586e7914024
 
 [template-kvm-import-script]
 filename = template/kvm-import.sh.jinja2

software/kvm/instance-kvm-import.cfg.jinja2.in

@@ -70,19 +70,16 @@ context =
     raw backup_signature {{ backup_signature }}
 
 [kvm-disk-image-corruption-bin]
-recipe = collective.recipe.template
-input = inline:#!/bin/sh
-  QEMU_IMAGE="${directory:srv}/virtual.qcow2"
-  if [ ! -s "$QEMU_IMAGE" ]; then
-    exit 0
-  fi
-  {{ qemu_location }}/bin/qemu-img check $QEMU_IMAGE
-  RETURN_CODE=$?
-  if [ $RETURN_CODE -eq 0 ] || [ $RETURN_CODE -eq 3 ]; then
-    exit 0
-  else
-    exit 1
-  fi
+recipe = slapos.recipe.template:jinja2
+url = {{ disk_image_corruption }}
+qemu_img_path = {{ qemu_location }}/bin/qemu-img
+disk_path = ${directory:srv}/virtual.qcow2
+# force empty disk device
+disk_device_path =
+context =
+  key disk_device_path :disk_device_path
+  key qemu_img_path :qemu_img_path
+  key disk_path :disk_path
 output = ${directory:bin}/kvm-disk-image-corruption
 mode = 700
 

software/kvm/instance.cfg.in

@@ -173,3 +173,4 @@ context =
     key slapparameter_dict slap-configuration:configuration
     key qmprestore qmprestore-binary:wrapper-path
     raw backup_signature ${buildout:bin-directory}/backup-signature
+    raw disk_image_corruption ${disk-image-corruption.sh:target}