Disable btrfs, fix ntfs mount

install/cl_install.py

@@ -809,13 +809,13 @@ class Install(color_print):
         """
         for disk in self.clVars.Select('os_disk_dev',
                                 where='os_disk_format',like='ntfs'):
-            mountDir = self._getFreeDirectory('/var/lib/calculate/mount.test')
+            mountDir = self._getFreeDirectory('/var/lib/calculate/mount.ntfs')
             try:
                 os.mkdir(mountDir)
             except:
                 continue
             if process('/bin/mount',disk,mountDir).success():
-                for i in (0.2,0.5,1,2):
+                for i in (0.2,0.5,1,2,4,5):
                     if process('/bin/umount',mountDir).success():
                         break
                 else:

install/fs_manager.py

@@ -63,8 +63,7 @@ class FileSystemManager:
                    'formatparam': '{labelparam} {device}',
                    'gpt': '0700',
                    'label': '-L {labelname}',
-                   'msdos': '83',
-                   'type':['hdd','usb-hdd']},
+                   'msdos': '83'},
          'jfs': {'defaultopt': defaultOpt,
                  'format': '/sbin/mkfs.jfs',
                  'formatparam': '{labelparam} -f {device}',