Merge branch 'hotfix-0.4.4' into develop

[snf-image-creator] / image_creator / os_type / __init__.py

diff --git a/image_creator/os_type/__init__.py b/image_creator/os_type/__init__.py
index 69e45d9..cc7d39a 100644 (file)
--- a/image_creator/os_type/__init__.py
+++ b/image_creator/os_type/__init__.py
@@ -138,6 +138,13 @@ class OSBase(object):
         self.meta = {}
         self.mounted = False
 
         self.meta = {}
         self.mounted = False
 

+        # Many guestfs compilations don't support scrub
+        self._scrub_support = True
+        try:
+            self.g.available(['scrub'])
+        except RuntimeError:
+            self._scrub_support = False
+

     def collect_metadata(self):
         """Collect metadata about the OS"""
         try:
     def collect_metadata(self):
         """Collect metadata about the OS"""
         try: