Merge branch 'master' of https://git.ik.bme.hu/CIRCLE3/storagedriver

disk.py

@@ -181,7 +181,8 @@ class Disk(object):
         format_map = [
         format_map = [
             ("qcow", "qcow2-norm"),
             ("qcow", "qcow2-norm"),
             ("iso", "iso"),
             ("iso", "iso"),
-            ("x86 boot sector", "iso")
+            ("x86 boot sector", "iso"),
+            ("dos/mbr", "iso")
         ]
         ]
         with magic.Magic() as m:
         with magic.Magic() as m:
             ftype = m.id_filename(self.get_path())
             ftype = m.id_filename(self.get_path())

miscellaneous/storagecelery@.service

@@ -12,4 +12,4 @@ Restart=always
 
 
 WorkingDirectory=/home/cloud/storagedriver
 WorkingDirectory=/home/cloud/storagedriver
 
 
-ExecStart=/bin/bash -c "source /home/cloud/.virtualenvs/storage/bin/activate; source /home/cloud/.virtualenvs/storage/bin/postactivate; exec celery -A storagecelery worker --loglevel=info -n $(/bin/hostname -s).%I"
+ExecStart=/bin/bash -c "source /etc/profile; workon storagedriver; exec celery -A storagecelery worker --loglevel=debug -n $(/bin/hostname -s).%I"