diff options
| author | Eugeni Dodonov <eugeni@mandriva.org> | 2009-04-20 14:24:56 +0000 |
|---|---|---|
| committer | Eugeni Dodonov <eugeni@mandriva.org> | 2009-04-20 14:24:56 +0000 |
| commit | ea3dcc9f747e2b301bf163ea51b7ec7e1f275e58 (patch) | |
| tree | 2f0a8dee518168c746e3f13b75345362138338c5 | |
| parent | a28a1ffe376628f2243fe12539b9351c12ac002f (diff) | |
| download | msec-ea3dcc9f747e2b301bf163ea51b7ec7e1f275e58.tar msec-ea3dcc9f747e2b301bf163ea51b7ec7e1f275e58.tar.gz msec-ea3dcc9f747e2b301bf163ea51b7ec7e1f275e58.tar.bz2 msec-ea3dcc9f747e2b301bf163ea51b7ec7e1f275e58.tar.xz msec-ea3dcc9f747e2b301bf163ea51b7ec7e1f275e58.zip | |
Properly support ntfs-3g (#50125).
| -rwxr-xr-x | src/msec/libmsec.py | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/msec/libmsec.py b/src/msec/libmsec.py index 22354cd..e442a0e 100755 --- a/src/msec/libmsec.py +++ b/src/msec/libmsec.py @@ -973,14 +973,13 @@ 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) - 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) else: - fstab.replace_line_matching("(.*\s(vfat|ntfs)\s+\S*)umask=\d+(.*)", "@1umask=0@3", 0, 1) - fstab.replace_line_matching("(.*\s(vfat|ntfs)\s+)(?!.*umask=)(\S+)(.*)", "@1@3,umask=0@4", 0, 1) + 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) def allow_reboot(self, arg): ''' Allow system reboot and shutdown to local users.''' |