Merge ~paride/autopkgtest-cloud:armhf-lxd-scsi-virtio into autopkgtest-cloud:master

[Paride Legovini]

diff --git a/charms/focal/autopkgtest-cloud-worker/autopkgtest-cloud/tools/armhf-lxd.userdata b/charms/focal/autopkgtest-cloud-worker/autopkgtest-cloud/tools/armhf-lxd.userdata
index bd5975d..b05bc6e 100644
--- a/charms/focal/autopkgtest-cloud-worker/autopkgtest-cloud/tools/armhf-lxd.userdata
+++ b/charms/focal/autopkgtest-cloud-worker/autopkgtest-cloud/tools/armhf-lxd.userdata
@@ -109,16 +109,16 @@ write_files:
 # then create new ~ 80 GB partition and mount it as /srv
 # use compat_uts_machine=armv7l so that 'linux32 uname -m' shows armv7l, like the buildds
 runcmd:
- - printf 'x\ne\nw\ny\n' | gdisk /dev/vda
- - printf "d\n1\nn\n\n\n+8000M\n\n\nw\ny\n" | gdisk /dev/vda
+ - printf 'x\ne\nw\ny\n' | gdisk /dev/sda
+ - printf "d\n1\nn\n\n\n+8000M\n\n\nw\ny\n" | gdisk /dev/sda
  - partprobe
- - resize2fs /dev/vda1
- - lsblk -dno PARTUUID /dev/vda1 | awk '{ print "GRUB_FORCE_PARTUUID=" $0 }' | tee /etc/default/grub.d/40-force-partuuid.cfg
+ - resize2fs /dev/sda1
+ - lsblk -dno PARTUUID /dev/sda1 | awk '{ print "GRUB_FORCE_PARTUUID=" $0 }' | tee /etc/default/grub.d/40-force-partuuid.cfg
  - update-grub
- - echo 'mkpart primary btrfs 8495MB 100%\n' | parted /dev/vda
- - for timeout in `seq 10`; do [ -e /dev/vda2 ] && break; sleep 1; done
+ - echo 'mkpart primary btrfs 8495MB 100%\n' | parted /dev/sda
+ - for timeout in `seq 10`; do [ -e /dev/sda2 ] && break; sleep 1; done
 
- - mkfs.btrfs -L autopkgtest /dev/vda2
+ - mkfs.btrfs -L autopkgtest /dev/sda2
  - systemctl stop snap.lxd.daemon.service snap.lxd.daemon.unix.socket
  - echo 'LABEL=autopkgtest   /srv   btrfs defaults 0 0' >> /etc/fstab
  - echo '/srv/var-snap-lxd-common /var/snap/lxd/common none defaults,bind 0 0' >> /etc/fstab