kameleon-builder 2.1.3 → 2.2.0

data/templates/steps/bootstrap/prepare_virtualbox.yaml

@@ -0,0 +1,63 @@
+- insecure_ssh_key: $$kameleon_cwd/insecure_ssh_key
+
+- download_boot2kameleon_iso:
+  - download_file_local:
+    - $$boot2kameleon_url
+    - $$kameleon_cwd/boot2kameleon.iso
+
+- create_vdi_disk:
+  - exec_local: rm -f $$virtualbox_image_disk
+  - exec_local: VBoxManage createhd --filename $$virtualbox_image_disk --size $$virtualbox_image_size 2>&1
+
+- register_vm:
+  - exec_local: echo "Creating virtual machine"
+  - exec_local: VBoxManage createvm --name $$virtualbox_vmid --register
+  - exec_local: VBoxManage modifyvm $$virtualbox_vmid --ostype $$virtualbox_os_type
+  - exec_local: VBoxManage modifyvm $$virtualbox_vmid --boot1 dvd
+  - exec_local: VBoxManage modifyvm $$virtualbox_vmid --boot2 disk
+  - exec_local: VBoxManage modifyvm $$virtualbox_vmid --memory $$virtualbox_memory_size
+  - exec_local: VBoxManage modifyvm $$virtualbox_vmid --acpi on
+  - exec_local: VBoxManage modifyvm $$virtualbox_vmid --nic1 nat --nictype1 82540EM --cableconnected1 on
+  - exec_local: VBoxManage modifyvm $$virtualbox_vmid --natpf1 guestssh,tcp,,$$virtualbox_ssh_port,,22
+  - exec_local: VBoxManage storagectl $$virtualbox_vmid --name "IDE Controller" --add ide
+  - exec_local: |
+      VBoxManage storageattach $$virtualbox_vmid \
+        --storagectl "IDE Controller" \
+        --port 0 \
+        --device 0 \
+        --type hdd \
+        --medium $$virtualbox_image_disk
+  - exec_local: VBoxManage storageattach $$virtualbox_vmid --storagectl "IDE Controller" --port 1 --device 0 --type dvddrive --medium $$kameleon_cwd/boot2kameleon.iso
+
+- delete_vm:
+  - on_checkpoint: skip
+  - on_export_clean:
+    - exec_local: |
+        if VBoxManage list vms | grep -q $$virtualbox_vmid; then
+          echo "Removing the virtualbox vm ($$virtualbox_vmid)..."
+          VBoxManage unregistervm --delete $$virtualbox_vmid 2>&1
+        fi
+
+- configure_ssh_access:
+  - download_file_local:
+    - $$insecure_ssh_key_url
+    - $$insecure_ssh_key
+  - exec_local: chmod 600 $$insecure_ssh_key
+
+- create_ssh_config:
+  - write_local:
+    - $$ssh_config_file
+    - |
+      Host $${kameleon_recipe_name}
+      HostName 127.0.0.1
+      Port $${virtualbox_ssh_port}
+      User root
+      IdentityFile $$insecure_ssh_key
+      UserKnownHostsFile /dev/null
+      StrictHostKeyChecking no
+      PasswordAuthentication no
+      IdentitiesOnly yes
+      LogLevel FATAL
+      ForwardAgent yes
+      Compression yes
+      Protocol 2

data/templates/steps/bootstrap/start_chroot.yaml

@@ -1,13 +1,14 @@
 # # Bootstrap
 - mount_chroot:
-  - on_checkpoint: redo
   - check_cmd_out: chroot
   - exec_out: mount -o bind /dev  $$rootfs/dev
   - exec_out: mount -o bind /dev/pts $$rootfs/dev/pts
   - exec_out: mount -t proc /proc  $$rootfs/proc
   - exec_out: mount -t sysfs /sys  $$rootfs/sys
   - exec_out: test -f $$rootfs/etc/mtab || cat /proc/mounts > $$rootfs/etc/mtab
+  - exec_out: cat /etc/resolv.conf > $$rootfs/etc/resolv.conf
   - on_setup_clean:
+    - exec_out: rm -f $$rootfs/etc/resolv.conf
     - exec_out: echo try umount $$rootfs/sys... ; mountpoint -q $$rootfs/sys && umount -f -l $$rootfs/sys  || true
     - exec_out: echo try umount $$rootfs/proc... ; mountpoint -q $$rootfs/proc && umount  -f -l $$rootfs/proc  || true
     - exec_out: echo try umount $$rootfs/dev/pts... ; mountpoint -q $$rootfs/dev/pts && umount -f -l $$rootfs/dev/pts  || true
@@ -17,7 +18,6 @@
 - cpuset_name: kameleon
 
 - init_cpuset:
-  - on_checkpoint: redo
   - on_setup_init:
     - exec_in: |
         if [ ! -f $$cpuset_base_name/cpus ]; then
@@ -32,7 +32,6 @@
     - exec_in: echo $$ > $$cpuset_base_name/$$cpuset_name/tasks
 
 - clean_cpuset:
-  - on_checkpoint: redo
   - on_setup_clean:
     - exec_out: CPUSET_DIR="$$rootfs/$$cpuset_base_name"
     - exec_out: |
@@ -50,13 +49,3 @@
           rmdir $CPUSET_DIR/$$cpuset_name
         fi
     - exec_out: echo try umount $CPUSET_DIR... ; mountpoint -q $CPUSET_DIR && umount -f -l $CPUSET_DIR || true
-
-- enable_checkpoint:
-  - on_checkpoint: redo
-  - on_setup_init:
-    - exec_out: touch $$kameleon_cwd/checkpoint_enabled
-
-- disable_checkpoint:
-  - on_checkpoint: redo
-  - on_setup_clean:
-    - exec_out: rm -f $$kameleon_cwd/checkpoint_enabled

data/templates/steps/bootstrap/start_qemu.yaml

@@ -1,75 +1,72 @@
+- boot_timeout: 30
+- shutdown_timeout: 10
+
 - start_qemu_vm:
   - on_checkpoint: redo
-  - check_cmd_out: qemu-system-$$qemu_arch
-  - exec_out: echo "sync" ; sync
-  - exec_out: echo "+++ Starting kvm..."
-  - exec_out: |
+  - check_cmd_local: qemu-system-$$qemu_arch
+  - exec_local: echo "Starting qemu..."
+  - exec_local: |
       if [ $$qemu_enable_kvm = true ]; then
         ENABLE_KVM="-enable-kvm"
       fi
-  - exec_out: |
+  - exec_local: |
         if [ -f "vm_state_to_load.txt" ]
         then
             SAVED_STATE="$(cat vm_state_to_load.txt)"
             LOADVM="-loadvm $SAVED_STATE"
             rm -f vm_state_to_load.txt
         fi
-  - exec_out: |
-        nohup qemu-system-$$qemu_arch  \
-          $ENABLE_KVM -no-reboot \
-          -drive file="$$image_disk",cache=unsafe,media=disk,if=virtio,id=drive0 \
+  - exec_local: |
+        qemu-system-$$qemu_arch  \
+          $ENABLE_KVM \
+          -cdrom $$kameleon_cwd/boot2kameleon.iso \
+          -drive file="$$qemu_image_disk",cache=unsafe,media=disk,if=virtio,id=drive0 \
           -smp $${qemu_cpu} \
           -m $$qemu_memory_size \
           -rtc base=localtime \
           -net nic,model=virtio -net user \
           -redir tcp:$${qemu_ssh_port}::22 \
-          -monitor tcp::$$qemu_monitor_port,server,nowait \
-          -vnc :1 $LOADVM \
-        1>qemu.log 2>&1 & disown
-  - exec_out: |
-        echo -n "Waiting for SSH to become available"
-        until ssh-keyscan -4 -p $$qemu_ssh_port localhost  2>&1 | grep -e ssh-rsa -e ssh-dsa &> /dev/null
+          -monitor unix:$$qemu_monitor_socket,server,nowait \
+          -pidfile $$qemu_pidfile \
+          -daemonize -vnc :1 $LOADVM
+  - exec_local: |
+        NEXT_WAIT_TIME=0
+        until ssh-keyscan -T 1 -4 -p $$qemu_ssh_port localhost  2>&1 | grep -e ssh-rsa -e ssh-dsa &> /dev/null || [ $NEXT_WAIT_TIME -eq $$boot_timeout ];
         do
-          echo -n "."
-          sleep 1
+          echo -en "\rWaiting for SSH to become available for out_context...($(( $$boot_timeout - 1 - NEXT_WAIT_TIME++ ))s)"
         done
-        echo " ~> OK"
-
-- shutdown_qemu_vm:
-  - on_checkpoint: redo
-  - on_setup_clean:
-    - exec_in: echo "Removing insecure ssh key..."
-    - exec_in: |
-        grep -f /root/.ssh/kameleon_insecure_public_key -v /root/.ssh/authorized_keys \
-            | cat > /root/.ssh/authorized_keys
-        rm -f /root/.ssh/kameleon_insecure_public_key
-    - exec_out: echo -n "Shutting down qemu virtual machine"
-    - exec_in: |
-        sleep 2 && shutdown -h now &
-    - exec_out: |
-        while nc -w 1 -z localhost $$qemu_monitor_port
-        do
-          sleep 1
-          echo -n "."
-        done
-        echo " ~> OK"
+        echo ""
+  - rescue:
+    - exec_local: ssh-keyscan -T 1 -4 -p $$qemu_ssh_port localhost  2>&1 | grep -e ssh-rsa -e ssh-dsa &> /dev/null
+    - breakpoint: Failed to connect to VM via SSH. Please verify the VM successfully booted with a vnc client.
 
 - force_shutdown_qemu_vm:
   - on_checkpoint: redo
-  - on_export_clean:
-    - exec_out: |
-        if nc -w 1 -z localhost $$qemu_monitor_port 2>/dev/null
-        then
-          echo "Shutting down qemu virtual machine..."
-          echo "system_reset" | nc localhost $$qemu_monitor_port 1>/dev/null 2>&1
-        fi
-
-- enable_checkpoint:
-  - on_checkpoint: redo
-  - on_setup_init:
-    - exec_out: touch $$kameleon_cwd/checkpoint_enabled
-
-- disable_checkpoint:
-  - on_checkpoint: redo
+  - check_cmd_local: socat
   - on_setup_clean:
-    - exec_out: rm -f $$kameleon_cwd/checkpoint_enabled
+    - exec_local: |
+        if [ -f $$qemu_pidfile ]; then
+          _QEMU_PID=$(cat $$qemu_pidfile)
+          if [ -S $$qemu_monitor_socket ]; then
+            NEXT_WAIT_TIME=0
+            echo system_powerdown | socat - UNIX-CONNECT:$$qemu_monitor_socket
+            while ps -p $_QEMU_PID > /dev/null && [ $NEXT_WAIT_TIME -lt $$shutdown_timeout ];
+            do
+              sleep 1
+              echo -en "\rWaiting for qemu virtual machine to shutdown...($(( $$shutdown_timeout - 1 - NEXT_WAIT_TIME++ ))s)"
+            done
+          fi
+          if ps -p $_QEMU_PID > /dev/null; then
+            if [ -S $$qemu_monitor_socket ]; then
+              echo "  ~> Failed"
+            fi
+            echo "Killing QEMU (pid: $_QEMU_PID)..."
+            kill -9 "$_QEMU_PID"
+          else
+            if [ -S $$qemu_monitor_socket ]; then
+              echo "  ~> Done"
+            fi
+          fi
+          rm -f $$qemu_pidfile
+        fi
+        rm -f $$qemu_monitor_socket

data/templates/steps/bootstrap/start_virtualbox.yaml

@@ -0,0 +1,37 @@
+- boot_timeout: 30
+- shutdown_timeout: 10
+
+- start_vm:
+  - on_checkpoint: redo
+  - exec_local: echo "Starting virtualbox..."
+  - exec_local: VBoxManage startvm  $$virtualbox_vmid --type headless 2>&1
+  - exec_local: |
+        NEXT_WAIT_TIME=0
+        until ssh-keyscan -T 1 -4 -p $$virtualbox_ssh_port localhost  2>&1 | grep -e ssh-rsa -e ssh-dsa &> /dev/null || [ $NEXT_WAIT_TIME -eq $$boot_timeout ];
+        do
+          echo -en "\rWaiting for SSH to become available for out_context...($(( $$boot_timeout - 1 - NEXT_WAIT_TIME++ ))s)"
+        done
+        echo ""
+  - rescue:
+    - exec_local: ssh-keyscan -T 1 -4 -p $$virtualbox_ssh_port localhost  2>&1 | grep -e ssh-rsa -e ssh-dsa &> /dev/null
+    - breakpoint: Failed to connect to VM via SSH. Please verify the VM successfully booted by looking at the VirtualBox GUI.
+
+- shutdown_vm:
+  - on_checkpoint: redo
+  - on_setup_clean:
+    - exec_local: |
+        if VBoxManage list runningvms | grep -q $$virtualbox_vmid; then
+          VBoxManage controlvm $$virtualbox_vmid acpipowerbutton
+          NEXT_WAIT_TIME=0
+          until $(VBoxManage showvminfo --machinereadable $$virtualbox_vmid | grep -q ^VMState=.poweroff.) || [ $NEXT_WAIT_TIME -eq $$shutdown_timeout ];
+          do
+            sleep 1
+            echo -en "\rWaiting for machine $$virtualbox_vmid to shutdown...($(( $$shutdown_timeout - 1 - NEXT_WAIT_TIME++ ))s)"
+          done
+        fi
+    - exec_local: |
+        if VBoxManage list runningvms | grep -q $$virtualbox_vmid; then
+          echo "  ~> Failed"
+          echo "Forcing shutdown !"
+          VBoxManage controlvm $$virtualbox_vmid poweroff
+        fi

data/templates/steps/bootstrap/switch_context_qemu.yaml

@@ -0,0 +1,64 @@
+- reboot_timeout: 30
+
+- prepare_sshd:
+  - exec_out: mkdir -p $$rootfs/root/.ssh/
+  - exec_out: cat /root/.ssh/authorized_keys >> $$rootfs/root/.ssh/authorized_keys
+  - exec_out: cat /root/.ssh/authorized_keys >> $$rootfs/root/.ssh/authorized_keys_to_remove
+  - exec_out: chmod 600 -R $$rootfs/root/.ssh
+  - on_setup_clean:
+    - exec_in: grep -v -f /root/.ssh/authorized_keys_to_remove /root/.ssh/authorized_keys || true
+    - exec_in: rm -f /root/.ssh/authorized_keys_to_remove
+
+- mount_chroot:
+  - exec_out: mount -o bind /dev  $$rootfs/dev
+  - exec_out: mount -o bind /dev/pts $$rootfs/dev/pts
+  - exec_out: mount -t proc /proc  $$rootfs/proc
+  - exec_out: mount -t sysfs /sys  $$rootfs/sys
+
+- create_fstab:
+  - write_out:
+    - $$rootfs/etc/fstab
+    - |
+      # /etc/fstab: static file system information.
+      #
+      # <file system> <mount point>   <type>  <options>       <dump>  <pass>
+      UUID=`blkid -s UUID -o value $${disk_device}1` /               $$filesystem_type    errors=remount-ro  0       1
+
+- install_initial_bootloader:
+  - exec_out: mkdir -p $$rootfs/boot/extlinux
+  - exec_out: extlinux --install $$rootfs/boot/extlinux 2>&1
+  - exec_out: MBR_PATH="/usr/lib/extlinux/mbr.bin"
+  - exec_out: dd if="$MBR_PATH" of="$$disk_device" bs=440  2>&1
+  - write_out:
+    - $$rootfs/boot/extlinux/extlinux.conf
+    - |
+      default linux
+      timeout 1
+      
+      label linux
+      kernel ../`basename $$rootfs/boot/vmlinuz*`
+      append initrd=../`basename $$rootfs/boot/init*` root=UUID=`blkid -s UUID -o value $${disk_device}1` ro
+
+- umount_all:
+  - umount_out: $$rootfs/sys
+  - umount_out: $$rootfs/proc
+  - umount_out: $$rootfs/dev/pts
+  - umount_out: $$rootfs/dev
+  - umount_out: $$rootfs
+
+- switch_out2in:
+  - exec_local: echo "Rebooting qemu vm"
+  - exec_local: echo "eject -f ide1-cd0" | socat - UNIX-CONNECT:$$qemu_monitor_socket
+  - exec_local: echo system_reset | socat - UNIX-CONNECT:$$qemu_monitor_socket
+  - exec_local: |
+        NEXT_WAIT_TIME=0
+        until ssh-keyscan -T 1 -4 -p $$qemu_ssh_port localhost  2>&1 | grep -e ssh-rsa -e ssh-dsa &> /dev/null || [ $NEXT_WAIT_TIME -eq $$reboot_timeout ];
+        do
+          echo -en "\rWaiting for SSH to become available for in_context...($(( $$reboot_timeout - 1 - NEXT_WAIT_TIME++ ))s)"
+        done
+        echo ""
+  - rescue:
+    - exec_local: ssh-keyscan -T 1 -4 -p $$qemu_ssh_port localhost  2>&1 | grep -e ssh-rsa -e ssh-dsa &> /dev/null
+    - breakpoint: Failed to connect to VM via SSH. Please verify the VM successfully booted by looking at the VirtualBox GUI.
+
+  - reload_context: out

data/templates/steps/bootstrap/switch_context_virtualbox.yaml

@@ -0,0 +1,66 @@
+- reboot_timeout: 30
+
+- prepare_sshd:
+  - exec_out: mkdir -p $$rootfs/root/.ssh/
+  - exec_out: cat /root/.ssh/authorized_keys >> $$rootfs/root/.ssh/authorized_keys
+  - exec_out: cat /root/.ssh/authorized_keys >> $$rootfs/root/.ssh/authorized_keys_to_remove
+  - exec_out: chmod 600 -R $$rootfs/root/.ssh
+  - on_setup_clean:
+    - exec_in: grep -v -f /root/.ssh/authorized_keys_to_remove /root/.ssh/authorized_keys || true
+    - exec_in: rm -f /root/.ssh/authorized_keys_to_remove
+
+- mount_chroot:
+  - exec_out: mount -o bind /dev  $$rootfs/dev
+  - exec_out: mount -o bind /dev/pts $$rootfs/dev/pts
+  - exec_out: mount -t proc /proc  $$rootfs/proc
+  - exec_out: mount -t sysfs /sys  $$rootfs/sys
+
+- create_fstab:
+  - write_out:
+    - $$rootfs/etc/fstab
+    - |
+      # /etc/fstab: static file system information.
+      #
+      # <file system> <mount point>   <type>  <options>       <dump>  <pass>
+      UUID=`blkid -s UUID -o value $${disk_device}1` /               $$filesystem_type    errors=remount-ro  0       1
+
+- install_initial_bootloader:
+  - exec_out: mkdir -p $$rootfs/boot/extlinux
+  - exec_out: extlinux --install $$rootfs/boot/extlinux 2>&1
+  - exec_out: MBR_PATH="/usr/lib/extlinux/mbr.bin"
+  - exec_out: dd if="$MBR_PATH" of="$$disk_device" bs=440  2>&1
+  - write_out:
+    - $$rootfs/boot/extlinux/extlinux.conf
+    - |
+      default linux
+      timeout 1
+      
+      label linux
+      kernel ../`basename $$rootfs/boot/vmlinuz*`
+      append initrd=../`basename $$rootfs/boot/init*` root=UUID=`blkid -s UUID -o value $${disk_device}1` ro
+
+- umount_all:
+  - umount_out: $$rootfs/sys
+  - umount_out: $$rootfs/proc
+  - umount_out: $$rootfs/dev/pts
+  - umount_out: $$rootfs/dev
+  - umount_out: $$rootfs
+
+- switch_out2in:
+  - exec_local: echo "Rebooting virtualbox vm ($$virtualbox_vmid)"
+  - exec_local: VBoxManage controlvm $$virtualbox_vmid poweroff 2>&1
+  - exec_local: VBoxManage modifyvm $$virtualbox_vmid --boot1 disk
+  - exec_local: VBoxManage modifyvm $$virtualbox_vmid --boot2 dvd
+  - exec_local: VBoxManage startvm  $$virtualbox_vmid --type headless 2>&1
+  - exec_local: |
+        NEXT_WAIT_TIME=0
+        until ssh-keyscan -T 1 -4 -p $$virtualbox_ssh_port localhost  2>&1 | grep -e ssh-rsa -e ssh-dsa &> /dev/null || [ $NEXT_WAIT_TIME -eq $$reboot_timeout ];
+        do
+          echo -en "\rWaiting for SSH to become available for in_context...($(( $$reboot_timeout - 1 - NEXT_WAIT_TIME++ ))s)"
+        done
+        echo ""
+  - rescue:
+    - exec_local: ssh-keyscan -T 1 -4 -p $$virtualbox_ssh_port localhost  2>&1 | grep -e ssh-rsa -e ssh-dsa &> /dev/null
+    - breakpoint: Failed to connect to VM via SSH. Please verify the VM successfully booted by looking at the VirtualBox GUI.
+
+  - reload_context: out

data/templates/steps/breakpoint.yaml

@@ -1,2 +1,3 @@
 - breakpoint:
-  - breakpoint: "Kameleon breakpoint"
+  - on_checkpoint: redo
+  - breakpoint

data/templates/steps/checkpoints/docker.yaml

@@ -1,14 +1,17 @@
-create: |
-    if [ -f MAIN_CONTAINER_ID ] ; then
-      docker commit $(cat MAIN_CONTAINER_ID) $$docker_image:@microstep_id
-    fi
+enabled?:
+  - exec_local: test -f $KAMELEON_WORKDIR/MAIN_CONTAINER_ID
 
-apply: |
-    docker tag $$docker_image:@microstep_id $$docker_image:latest
+create:
+  - exec_local: docker commit $(cat $KAMELEON_WORKDIR/MAIN_CONTAINER_ID) $$docker_image:@microstep_id
 
-list: |
-    docker images | grep $$docker_image | awk '{print $2}'
+apply:
+  - exec_local: docker tag $$docker_image:@microstep_id $$docker_image:latest
 
-clear: |
-    docker images | grep $$docker_image | awk '{print $3}' \
-    | xargs -I {} bash -c "docker rmi {} | cat || true"
+list:
+  - exec_local: |
+      docker images | grep $$docker_image | awk '{print $2}'
+
+clear:
+  - exec_local: |
+      docker images | grep $$docker_image | awk '{print $3}' \
+        | xargs -I {} bash -c "docker rmi {} | cat || true"

data/templates/steps/checkpoints/qcow2.yaml

@@ -1,6 +1,9 @@
-create: |
-    if [ -f "$$kameleon_cwd/checkpoint_enabled" ] ; then
-    if [ -e "$$image_disk" ] ; then
+enabled?:
+  - exec_local: test -f $$kameleon_cwd/checkpoint_enabled
+  - exec_local: test -e "$$image_disk"
+
+create:
+  - exec_local: |
       parent_of_@microstep_id="$(readlink $$image_disk)"
       pushd $$kameleon_cwd/checkpoints
       rm -f @microstep_id_checkpoint.qcow2
@@ -8,31 +11,30 @@ create: |
                       -o backing_file=$(basename "$parent_of_@microstep_id")
       popd
       ln -sf $$kameleon_cwd/checkpoints/@microstep_id_checkpoint.qcow2 $$image_disk
-
       lsmod | grep nbd >/dev/null || modprobe nbd max_part=63
-
       echo "sync" ; sync
       qemu-nbd -d $$nbd_device
       qemu-nbd -c $$nbd_device "$(readlink $$image_disk)"
-    fi
-    fi
 
-apply: |
-    # apply command use the backing file that represent the real state to restore
-    previous_id=$(qemu-img info "checkpoints/@microstep_id_checkpoint.qcow2" \
-                  | grep backing \
-                  | sed -e 's/.*checkpoints\/\(.*\)_checkpoint.qcow2\(.*\)/\1/p' \
-                  | uniq)
-    ln -sf "$$kameleon_cwd/checkpoints/${previous_id}_checkpoint.qcow2" "$$image_disk"
+apply:
+  - exec_local: |
+      # apply command use the backing file that represent the real state to restore
+      previous_id=$(qemu-img info "checkpoints/@microstep_id_checkpoint.qcow2" \
+                    | grep backing \
+                    | sed -e 's/.*checkpoints\/\(.*\)_checkpoint.qcow2\(.*\)/\1/p' \
+                    | uniq)
+      ln -sf "$$kameleon_cwd/checkpoints/${previous_id}_checkpoint.qcow2" "$$image_disk"
 
-clear: |
-    if [ -d "$$kameleon_cwd/checkpoints" ] ; then
-      ls $$kameleon_cwd/checkpoints/ | \
-        xargs -I {} bash -c "echo Removing $$kameleon_cwd/checkpoints/{} ; rm $$kameleon_cwd/checkpoints/{}"
-      rm -f $$image_disk
-    fi
+clear:
+  - exec_local: |
+      if [ -d "$$kameleon_cwd/checkpoints" ] ; then
+        ls $$kameleon_cwd/checkpoints/ | \
+          xargs -I {} bash -c "echo Removing $$kameleon_cwd/checkpoints/{} ; rm $$kameleon_cwd/checkpoints/{}"
+        rm -f $$image_disk
+      fi
 
-list: |
-    if [ -d "$$kameleon_cwd/checkpoints" ] ; then
-      ls $$kameleon_cwd/checkpoints/ | sed -e 's/\(.*\)_checkpoint.qcow2/\1/p' | uniq
-    fi
+list:
+  - exec_local: |
+      if [ -d "$$kameleon_cwd/checkpoints" ] ; then
+        ls $$kameleon_cwd/checkpoints/ | sed -e 's/\(.*\)_checkpoint.qcow2/\1/p' | uniq
+      fi