btrfs-comp переименован в btrfs-compress

pym/install/distr.py

@@ -1016,7 +1016,7 @@ class PartitionDistributive(Distributive):
         'ntfs': FormatNtfs,
         'uefi': FormatUefi,
         'btrfs': FormatBtrfs,
-        'btrfs-comp': FormatBtrfsCompressed,
+        'btrfs-compress': FormatBtrfsCompressed,
         'swap': FormatSwap
     }
 
@@ -1135,7 +1135,7 @@ class PartitionDistributive(Distributive):
                 realMountPoint = None
                 if fileSystem != "swap":
                     realMountPoint = pathJoin(mdirectory, mountPoint)
-                    mapFS = {'btrfs-comp': 'btrfs'}
+                    mapFS = {'btrfs-compress': 'btrfs'}
                     self._mountPartition(
                         dev, realMountPoint,
                         "-t %s" % mapFS.get(fileSystem,fileSystem))

pym/install/fs_manager.py

@@ -68,8 +68,8 @@ class FileSystemManager(object):
                   'msdos': '83',
                   'ssd': ['ssd', 'discard', 'space_cache'],
                   'type': ['hdd', 'usb-hdd'],
-                  'compatible': ['btrfs-comp']},
+                  'compatible': ['btrfs-compress']},
-        'btrfs-comp': {'defaultopt': defaultOpt,
+        'btrfs-compress': {'defaultopt': defaultOpt,
                   'format': '/sbin/mkfs.btrfs',
                   'orig': 'btrfs',
                   'formatparam': '{labelparam} -f {device}',

pym/install/variables/disk.py

@@ -584,7 +584,7 @@ class VariableOsDiskFormat(ReadonlyVariable):
             if fs == "btrfs":
                 try:
                     if Btrfs(dev).compression != "":   
-                        return "btrfs-comp"
+                        return "btrfs-compress"
                 except BtrfsError:
                     pass
             return fs