Merge pull request #1895 from fva-dev/issue#1347

Issues with afp share name #1347
rockstor · Apr 16, 2018 · caae123 · caae123
2 parents 67cf445 + 3e7eb1b
commit caae123
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/src/rockstor/storageadmin/views/netatalk.py b/src/rockstor/storageadmin/views/netatalk.py
@@ -123,8 +123,9 @@ def post(self, request):
         try:
             for share in shares:
                 mnt_pt = ('%s%s' % (settings.MNT_PT, share.name))
-                cur_description = '%s %s' % (share.name, description)
-                if (len(shares) == 1 and description != self.def_description):
+                cur_description = '%s' % share.name
+                #cur_description = '%s %s' % (share.name, description)
+                if (len(shares) == 1 and description != self.def_description and share.name == ''):
                     cur_description = description
                 afpo = NetatalkShare(share=share, path=mnt_pt,
                                      description=cur_description,

diff --git a/src/rockstor/system/services.py b/src/rockstor/system/services.py
@@ -223,7 +223,9 @@ def refresh_afp_config(afpl):
         rockstor_section = False
         tfo.write('; Netatalk 3.x configuration file\n\n')
         tfo.write('[Global]\n')
-        tfo.write('mimic model = RackMac\n\n')
+        tfo.write('mimic model = RackMac\n')
+        tfo.write('uam list = uams_dhx.so,uams_dhx2.so\n')
+        tfo.write('save password = no\n\n')
         for line in afo.readlines():
             if (re.match(';####BEGIN: Rockstor AFP CONFIG####', line)
                     is not None):