Discard using btrfs

install/fs_manager.py

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

install/variables/disk.py

@@ -1016,7 +1016,7 @@ class VariableOsLocationPerformFormat(LocationHelper,Variable):
                             (self.Get('os_disk_mount'))))
         unavailFS = set(self.Select('os_format_type',
                                     where='os_format_use',
-                                    eq="off"))
+                                    eq="no"))
         fixNtfs = self.fixNtfs
         for dev,mp,fs,isformat in info:
             # should format if change fs or partition is root, but non flash

install/variables/system.py

@@ -108,7 +108,8 @@ class VariableOsFormatUse(ReadonlyVariable):
 
     def get(self):
         return map(lambda x:"yes" 
-            if path.exists(FileSystemManager.supportFS[x]["format"])
+            if "format" in FileSystemManager.supportFS[x] and \
+               path.exists(FileSystemManager.supportFS[x]["format"])
             else "no", self.Get('os_format_type'))
 
 class VariableClMigrateRootPwd(UserHelper,Variable):