Добавлены дополнительные опции монтирования для ssd btrfs

pym/install/fs_manager.py

@@ -35,6 +35,7 @@ class FileSystemManager:
                   'formatparam': '{labelparam} {device}',
                   'gpt': '8300',
                   'label': '-L {labelname}',
+                  'ssd':[],
                   'msdos': '83',
                   'type':['hdd','usb-hdd']},
          'ext3': {'defaultopt': defaultOpt,
@@ -42,6 +43,7 @@ class FileSystemManager:
                   'formatparam': '{labelparam} {device}',
                   'gpt': '8300',
                   'label': '-L {labelname}',
+                  'ssd':[],
                   'msdos': '83',
                   'type':['hdd','usb-hdd']},
          'ext4': {'defaultopt': defaultOpt,
@@ -49,6 +51,7 @@ class FileSystemManager:
                   'formatparam': '{labelparam} {device}',
                   'gpt': '8300',
                   'label': '-L {labelname}',
+                  'ssd':[],
                   'msdos': '83',
                   'type':['hdd','usb-hdd']},
          'reiserfs': {'defaultopt': defaultOpt,
@@ -57,6 +60,7 @@ class FileSystemManager:
                       'gpt': '8300',
                       'label': '-l {labelname}',
                       'msdos': '83',
+                      'ssd':[],
                       'type':['hdd','usb-hdd']},
          'btrfs': {'defaultopt': defaultOpt,
                    'format':'/sbin/mkfs.btrfs',
@@ -64,6 +68,7 @@ class FileSystemManager:
                    'gpt': '8300',
                    'label': '-L {labelname}',
                    'msdos': '83',
+                   'ssd':['ssd','discard','space_cache'],
                    'type':['hdd','usb-hdd']},
          'jfs': {'defaultopt': defaultOpt,
                  'format': '/sbin/mkfs.jfs',
@@ -71,6 +76,7 @@ class FileSystemManager:
                  'gpt': '8300',
                  'label': '-L {labelname}',
                  'msdos': '83',
+                 'ssd':[],
                  'type':['hdd','usb-hdd']},
          'xfs': {'defaultopt': defaultOpt,
                  'format': '/sbin/mkfs.xfs',
@@ -78,6 +84,7 @@ class FileSystemManager:
                  'gpt': '8300',
                  'label': '-L {labelname}',
                  'msdos': '83',
+                 'ssd':[],
                  'type':['hdd','usb-hdd']},
          'nilfs2': {'defaultopt': defaultOpt,
                     'format': '/sbin/mkfs.nilfs2',
@@ -85,12 +92,14 @@ class FileSystemManager:
                     'gpt': '8300',
                     'label': '-L {labelname}',
                     'msdos': '83',
+                    'ssd':[],
                     'type':['hdd','usb-hdd']},
          'swap': {'defaultopt': 'sw',
                   'format': '/sbin/mkswap',
                   'formatparam': '{device}',
                   'gpt': '8200',
                   'label': '',
+                  'ssd':[],
                   'msdos': '82'},
          'uefi': {'defaultopt': defaultOpt,
                   'format': '/usr/sbin/mkfs.vfat',
@@ -98,6 +107,7 @@ class FileSystemManager:
                   'gpt': 'EF00',
                   'label': '-n {labelname}',
                   'msdos': '0b',
+                  'ssd':[],
                   'type':['hdd']},
          'vfat': {'defaultopt': defaultOpt,
                   'format': '/usr/sbin/mkfs.vfat',
@@ -105,6 +115,7 @@ class FileSystemManager:
                   'gpt': '0700',
                   'label': '-n {labelname}',
                   'msdos': '0b',
+                  'ssd':[],
                   'type':['flash']},
          'ntfs': {'defaultopt': defaultOpt,
                   'format': '/usr/sbin/mkfs.ntfs',
@@ -112,14 +123,19 @@ class FileSystemManager:
                   'gpt': '8300',
                   'label': '-L {labelname}',
                   'msdos': '7',
+                  'ssd':[],
                   'compatible':['ntfs-3g']},
          'ntfs-3g': {'defaultopt': defaultOpt,
                      'format': '/usr/sbin/mkfs.ntfs',
                      'formatparam': '{labelparam} -FQ {device}',
                      'gpt': '8300',
                      'label': '-L {labelname}',
+                     'ssd':[],
                      'msdos': '7',
                      'compatible':['ntfs']}}
+
+    default_param = {'defaultopt':defaultOpt,
+                     'ssd':[]}
     @classmethod
     def firstAvailable(cls,listFS):
         for fs in listFS:
@@ -141,8 +157,9 @@ class FileSystemManager:
                         "ext3"}
 
     @classmethod
-    def getDefaultOpt(cls,fs):
+    def getDefaultOpt(cls,fs, ssd=False):
-        return ",".join(cls.supportFS.get(fs,{'defaultopt':[]})['defaultopt'])
+        return ",".join(cls.supportFS.get(fs,cls.default_param)['defaultopt']+
+                (cls.supportFS.get(fs,cls.default_param)['ssd'] if ssd else []))
 
     @classmethod
     def checkFSForTypeMount(cls,fs,roottype,mp):

pym/install/variables/disk.py

@@ -1422,7 +1422,6 @@ class VariableOsInstallDiskOptions(ReadonlyVariable):
     type = "list"
 
     def get(self):
-        """TODO: get real options"""
         def postProcess(opt):
             l_opt = filter(None,opt.split(','))
             return ",".join(l_opt)
@@ -1430,11 +1429,15 @@ class VariableOsInstallDiskOptions(ReadonlyVariable):
         diskOpts = dict(filter(lambda x:x[1],
                         zip(self.Get('os_disk_dev'),
                             self.Get('os_disk_options'))))
+        ssdDisk = dict(self.ZipVars('install.os_device_dev',
+                                    'install.os_device_ssd_set'))
         return map(postProcess,
                map(lambda x:diskOpts.get(x[0],x[1]),
-               map(lambda x:(x[0],FileSystemManager.getDefaultOpt(x[1])),
+               map(lambda x:(x[0],FileSystemManager.getDefaultOpt(x[1],
+                                  ssd=ssdDisk.get(x[2], 'off')=='on')),
                self.ZipVars('os_install_disk_dev',
-                            'os_install_disk_format'))))
+                            'os_install_disk_format',
+                            'os_install_disk_parent'))))
 
 class VariableOsInstallDiskFormat(ReadonlyVariable):
     """

setup.py

@@ -33,9 +33,7 @@ data_files = []
 data_files += [('/etc/init.d', [('data/calculate',0755)]),
                ('/usr/bin',[('bin/xautologin',0755)]),
                ('/usr/share/calculate/doc', ['data/handbook-en.html',
-                                             'data/handbook-ru.html',
+                                             'data/handbook-ru.html']),
-                                             'data/handbook-es.html',
-                                             'data/handbook-fr.html']),
                ('/bin',[('bin/bashlogin',0755)])]
 
 packages = [