summaryrefslogtreecommitdiff
path: root/morphlib/exts/kvm.check
diff options
context:
space:
mode:
authorSam Thursfield <sam.thursfield@codethink.co.uk>2014-06-10 17:18:37 +0000
committerSam Thursfield <sam.thursfield@codethink.co.uk>2014-06-11 16:22:25 +0000
commit3e4edca024ae5ea0ff5516a7ae2402fae1108b83 (patch)
treedb9bc6f93753ea6270463bded05a0a704bbfa180 /morphlib/exts/kvm.check
parent2ca28887442c733f2f7a39aa7a844b51643ecb29 (diff)
downloadmorph-3e4edca024ae5ea0ff5516a7ae2402fae1108b83.tar.gz
Check for presence of btrfs before trying to use it
If btrfs is not present in the kernel we end up with strange output like this: Error creating disk image2014-06-10 16:00:40 [devel-system-x86_64-generic][my-raw-disk-image][rawdisk.write]Failure to create disk image at /src/tmp/testdev.img ERROR: Command failed: mount -o loop /src/tmp/testdev.img /src/tmp/deployments/tmpQ7wXO1/tmp4lVDcu/tmpvHSzDE mount: mounting /dev/loop0 on /src/tmp/deployments/tmpQ7wXO1/tmp4lVDcu/tmpvHSzDE failed: Device or resource busy To avoid this confusing error, Morph should explicitly check first.
Diffstat (limited to 'morphlib/exts/kvm.check')
-rwxr-xr-xmorphlib/exts/kvm.check2
1 files changed, 2 insertions, 0 deletions
diff --git a/morphlib/exts/kvm.check b/morphlib/exts/kvm.check
index 957d0893..1bb4007a 100755
--- a/morphlib/exts/kvm.check
+++ b/morphlib/exts/kvm.check
@@ -31,6 +31,8 @@ class KvmPlusSshCheckExtension(morphlib.writeexts.WriteExtension):
if len(args) != 1:
raise cliapp.AppException('Wrong number of command line args')
+ self.require_btrfs_in_deployment_host_kernel()
+
upgrade = self.get_environment_boolean('UPGRADE')
if upgrade:
raise cliapp.AppException(