diff options
author | Eugeni Dodonov <eugeni@mandriva.org> | 2009-04-22 19:01:27 +0000 |
---|---|---|
committer | Eugeni Dodonov <eugeni@mandriva.org> | 2009-04-22 19:01:27 +0000 |
commit | 522e3fac289dd99dc90753192256573992ba3217 (patch) | |
tree | 0f1a87af981945a0754b7d59adeec163c638b762 /src/msec/libmsec.py | |
parent | 50610bcb6fb8caf985d2a83c1a036ff08e10a4ce (diff) | |
download | msec-522e3fac289dd99dc90753192256573992ba3217.tar msec-522e3fac289dd99dc90753192256573992ba3217.tar.gz msec-522e3fac289dd99dc90753192256573992ba3217.tar.bz2 msec-522e3fac289dd99dc90753192256573992ba3217.tar.xz msec-522e3fac289dd99dc90753192256573992ba3217.zip |
Properly handle WIN_PARTS_UMASK.
Diffstat (limited to 'src/msec/libmsec.py')
-rwxr-xr-x | src/msec/libmsec.py | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/src/msec/libmsec.py b/src/msec/libmsec.py index e442a0e..9cd384a 100755 --- a/src/msec/libmsec.py +++ b/src/msec/libmsec.py @@ -973,10 +973,15 @@ class MSEC: def set_win_parts_umask(self, umask): ''' Set umask option for mounting vfat and ntfs partitions. If umask is '0', default system umask is used.''' fstab = self.configfiles.get_config_file(FSTAB) + try: + test_umask = int(umask) + except: + self.log.error(_('Invalid file system umask "%s"') % umask) + return if umask == "0": - fstab.replace_line_matching("(.*\s(vfat|ntfs)\s+)umask=\d+(\s.*)", "@1defaults@3", 0, 1) - fstab.replace_line_matching("(.*\s(vfat|ntfs)\s+)umask=\d+,(.*)", "@1@3", 0, 1) - fstab.replace_line_matching("(.*\s(vfat|ntfs)\s+\S+),umask=\d+(.*)", "@1@3", 0, 1) + fstab.replace_line_matching("(.*\s(vfat|ntfs|ntfs-3g)\s+)umask=\d+(\s.*)", "@1defaults@3", 0, 1) + fstab.replace_line_matching("(.*\s(vfat|ntfs|ntfs-3g)\s+)umask=\d+,(.*)", "@1@3", 0, 1) + fstab.replace_line_matching("(.*\s(vfat|ntfs|ntfs-3g)\s+\S+),umask=\d+(.*)", "@1@3", 0, 1) else: fstab.replace_line_matching("(.*\s(vfat|ntfs|ntfs-3g)\s+\S*)umask=\d+(.*)", "@1umask="+umask+"@3", 0, 1) fstab.replace_line_matching("(.*\s(vfat|ntfs|ntfs-3g)\s+)(?!.*umask=)(\S+)(.*)", "@1@3,umask="+umask+"@4", 0, 1) |