Fix wrong detect root partition missing.

Fix mount already mounted ntfs partition.
netsetup
Mike Hiretsky 14 years ago
parent a9e079a891
commit 585781d934

@ -392,7 +392,9 @@ class Distributive(object):
if res is True:
return True
else:
raise DistributiveError(_("Cann't copy file from") +\
if "No space left on device" in errmes:
errmes = "No space left on device"
raise DistributiveError(_("Cann't copy files from") +\
" '%s' " %fromdir + _("to") +\
" '%s':\n%s" %(todir,errmes))
@ -621,10 +623,10 @@ class PartitionDistributive(Distributive):
self.DirectoryObject = None
self.systemId = systemId
def _mountPartition(self,partition,directory):
def _mountPartition(self,partition,directory,opts=""):
"""Mount partition to directory"""
self._makeDirectory(directory)
self._mountToDirectory(partition,directory)
self._mountToDirectory(partition,directory,opts)
def _umountPartition(self,directory):
"""Umount partition and remove directory"""
@ -686,7 +688,7 @@ class PartitionDistributive(Distributive):
for dev, mountPoint, fileSystem, isFormat in mulipartDataNotBind:
if fileSystem!="swap":
realMountPoint = pathJoin(mdirectory, mountPoint)
self._mountPartition(dev,realMountPoint)
self._mountPartition(dev,realMountPoint,"-t %s"%fileSystem)
partObj = PartitionDistributive(dev, flagRemoveDir=False,
fileSystem=fileSystem,
isFormat=isFormat,

@ -1088,7 +1088,8 @@ class cl_install(color_print):
%curMP)
return False
else:
if mountPoint in dictMountDev and mountPoint != "swap":
if mountPoint and mountPoint in dictMountDev and \
mountPoint != "swap":
devMount[dictMountDev[mountPoint]]['mountPoint'] = ''
devMount[dev]['mountPoint'] = mountPoint
devMount[dev]['options'] = ",".join(diskData['options'])

Loading…
Cancel
Save