From cfa148ba663aae7cc80b11aff9c20be22c56bc16 Mon Sep 17 00:00:00 2001 From: Mike Hiretsky Date: Tue, 25 Dec 2012 15:24:27 +0400 Subject: [PATCH] Disable btrfs, fix ntfs mount --- install/cl_install.py | 4 ++-- install/fs_manager.py | 3 +-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/install/cl_install.py b/install/cl_install.py index 65d4972..6cd63c5 100644 --- a/install/cl_install.py +++ b/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: diff --git a/install/fs_manager.py b/install/fs_manager.py index f3f7a62..4b7eb34 100644 --- a/install/fs_manager.py +++ b/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}',