Changeset 72259 in vbox for trunk/src/VBox/ValidationKit/testboxscript/testboxscript_real.py

Timestamp:

May 18, 2018 10:22:17 AM (7 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

122706

Message:

testboxscript: introduce a way to specify custom mount options

File:

• trunk/src/VBox/ValidationKit/testboxscript/testboxscript_real.py (modified) (9 diffs)

trunk/src/VBox/ValidationKit/testboxscript/testboxscript_real.py

@@ -248 +248 @@
         self._mountShare(self._oOptions.sBuildsPath, self._oOptions.sBuildsServerType, self._oOptions.sBuildsServerName,
                          self._oOptions.sBuildsServerShare,
-                         self._oOptions.sBuildsServerUser, self._oOptions.sBuildsServerPasswd, 'builds');
+                         self._oOptions.sBuildsServerUser, self._oOptions.sBuildsServerPasswd,
+                         self._oOptions.sBuildsServerMountOpt, 'builds');
         self._mountShare(self._oOptions.sTestRsrcPath, self._oOptions.sTestRsrcServerType, self._oOptions.sTestRsrcServerName,
                          self._oOptions.sTestRsrcServerShare,
-                         self._oOptions.sTestRsrcServerUser, self._oOptions.sTestRsrcServerPasswd, 'testrsrc');
+                         self._oOptions.sTestRsrcServerUser, self._oOptions.sTestRsrcServerPasswd,
+                         self._oOptions.sTestRsrcServerMountOpt, 'testrsrc');
         return True;
 
-    def _mountShare(self, sMountPoint, sType, sServer, sShare, sUser, sPassword, sWhat):
+    def _mountShare(self, sMountPoint, sType, sServer, sShare, sUser, sPassword, sMountOpt, sWhat):
         """
         Mounts the specified share if needed.
@@ -273 +275 @@
         sHostOs = utils.getHostOs()
         if sHostOs in ('darwin', 'freebsd'):
+            if sMountOpt != '':
+                sMountOpt = ',' + sMountOpt
             utils.sudoProcessCall(['/sbin/umount', sMountPoint]);
             utils.sudoProcessCall(['/bin/mkdir', '-p', sMountPoint]);
@@ -278 +282 @@
             if sType == 'cifs':
                 # Note! no smb://server/share stuff here, 10.6.8 didn't like it.
-                utils.processOutputChecked(['/sbin/mount_smbfs', '-o', 'automounted,nostreams,soft,noowners,noatime,rdonly',
+                utils.processOutputChecked(['/sbin/mount_smbfs',
+                                            '-o',
+                                            'automounted,nostreams,soft,noowners,noatime,rdonly' + sMountOpt,
                                             '-f', '0555', '-d', '0555',
                                             '//%s:%s@%s/%s' % (sUser, sPassword, sServer, sShare),
@@ -286 +292 @@
 
         elif sHostOs == 'linux':
+            if sMountOpt != '':
+                sMountOpt = ',' + sMountOpt
             utils.sudoProcessCall(['/bin/umount', sMountPoint]);
             utils.sudoProcessCall(['/bin/mkdir', '-p', sMountPoint]);
@@ -296 +304 @@
                                                 + ',uid=' + str(os.getuid()) # pylint: disable=E1101
                                                 + ',gid=' + str(os.getgid()) # pylint: disable=E1101
-                                                + ',nounix,file_mode=0555,dir_mode=0555,soft,ro',
+                                                + ',nounix,file_mode=0555,dir_mode=0555,soft,ro'
+                                                + sMountOpt,
                                                 '//%s/%s' % (sServer, sShare),
                                                 sMountPoint]);
             elif sType == 'nfs':
                 utils.sudoProcessOutputChecked(['/bin/mount', '-t', 'nfs',
-                                                '-o', 'soft,ro',
+                                                '-o', 'soft,ro' + sMountOpt,
                                                 '%s:%s' % (sServer, sShare if sShare.find('/') >= 0 else ('/export/' + sShare)),
                                                 sMountPoint]);
@@ -309 +318 @@
 
         elif sHostOs == 'solaris':
+            if sMountOpt != '':
+                sMountOpt = ',' + sMountOpt
             utils.sudoProcessCall(['/sbin/umount', sMountPoint]);
             utils.sudoProcessCall(['/bin/mkdir', '-p', sMountPoint]);
@@ -321 +332 @@
                                                 + ',uid=' + str(os.getuid()) # pylint: disable=E1101
                                                 + ',gid=' + str(os.getgid()) # pylint: disable=E1101
-                                                + ',fileperms=0555,dirperms=0555,noxattr,ro',
+                                                + ',fileperms=0555,dirperms=0555,noxattr,ro'
+                                                + sMountOpt,
                                                 '//%s/%s' % (sServer, sShare),
                                                 sMountPoint],
@@ -328 +340 @@
             elif sType == 'nfs':
                 utils.sudoProcessOutputChecked(['/sbin/mount', '-F', 'nfs',
-                                                '-o', 'noxattr,ro',
+                                                '-o', 'noxattr,ro' + sMountOpt,
                                                 '%s:%s' % (sServer, sShare if sShare.find('/') >= 0 else ('/export/' + sShare)),
                                                 sMountPoint]);
@@ -950 +962 @@
                               dest=sPrefix + 'ServerPasswd', metavar='<password>', default='guestr',
                               help='The password to use when accessing the ' + sDesc + ' share.');
+            parser.add_option('--' + sLower + '-server-mountopt',
+                              dest=sPrefix + 'ServerMountOpt', metavar='<mountopt>', default='',
+                              help='The mount options to use when accessing the ' + sDesc + ' share.');
 
         parser.add_option("--test-manager", metavar="<url>",