quotas for xfs

usmannasir · Sep 18, 2024 · 83ee98e · 83ee98e
1 parent 432a26d
commit 83ee98e
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 33 deletions.
diff --git a/install/install.py b/install/install.py
@@ -277,27 +277,13 @@ def edit_fstab(self,mount_point, options_to_add):
                 try:
                     if parts[1] == '/' and parts[3].find('usrquota,grpquota') == -1 and len(parts[3]) > 4:
 
-                        ### if xfx dont move forward for now
-                        if line.find('xfs') > -1:
-                            retValue = 0
-                            WriteToFile.write(line)
-                            continue
-                        ###
-
                         parts[3] = f'{parts[3]},usrquota,grpquota'
                         finalString = '\t'.join(parts)
                         print(finalString)
                         WriteToFile.write(finalString)
 
                     elif parts[1] == '/':
 
-                        ### if xfx dont move forward for now
-                        if line.find('xfs') > -1:
-                            retValue = 0
-                            WriteToFile.write(line)
-                            continue
-                        ###
-
                         for ii, p in enumerate(parts):
                             if p.find('defaults') > -1 or p.find('discard') > -1:
                                 parts[ii] = f'{parts[ii]},usrquota,grpquota'

diff --git a/plogical/upgrade.py b/plogical/upgrade.py
@@ -3629,13 +3629,19 @@ def installQuota():
 
     @staticmethod
     def edit_fstab(mount_point, options_to_add):
-
         try:
             retValue = 1
             # Backup the original fstab file
             fstab_path = '/etc/fstab'
             backup_path = fstab_path + '.bak'
 
+            rData = open(fstab_path, 'r').read()
+
+            if rData.find('xfs') > -1:
+                options_to_add = 'uquota'
+            else:
+                options_to_add = 'usrquota,grpquota'
+
             if not os.path.exists(backup_path):
                 shutil.copy(fstab_path, backup_path)
 
@@ -3654,32 +3660,18 @@ def edit_fstab(mount_point, options_to_add):
 
                 print(parts)
                 try:
-                    if parts[1] == '/' and parts[3].find('usrquota,grpquota') == -1 and len(parts[3]) > 4:
+                    if parts[1] == '/' and parts[3].find(options_to_add) == -1 and len(parts[3]) > 4:
 
-                        ### if xfx dont move forward for now
-                        if line.find('xfs') > -1:
-                            retValue = 0
-                            WriteToFile.write(line)
-                            continue
-                        ###
-
-                        parts[3] = f'{parts[3]},usrquota,grpquota'
+                        parts[3] = f'{parts[3]},{options_to_add}'
                         finalString = '\t'.join(parts)
                         print(finalString)
                         WriteToFile.write(finalString)
 
                     elif parts[1] == '/':
 
-                        ### if xfx dont move forward for now
-                        if line.find('xfs') > -1:
-                            retValue = 0
-                            WriteToFile.write(line)
-                            continue
-                        ###
-
                         for ii, p in enumerate(parts):
                             if p.find('defaults') > -1 or p.find('discard') > -1:
-                                parts[ii] = f'{parts[ii]},usrquota,grpquota'
+                                parts[ii] = f'{parts[ii]},{options_to_add}'
                                 finalString = '\t'.join(parts)
                                 print(finalString)
                                 WriteToFile.write(finalString)
@@ -3701,7 +3693,7 @@ def FixCurrentQuoatasSystem():
 
         data = open(fstab_path, 'r').read()
 
-        if data.find("usrquota,grpquota") > -1:
+        if data.find("usrquota,grpquota") > -1 or data.find("uquota") > -1:
             print("Quotas already enabled.")