Changeset 3658 in MondoRescue for branches

Timestamp:

May 3, 2017, 11:27:05 AM (8 years ago)

Author:

Bruno Cornec

Message:

Improve nfs version support by allowing usage of nfs4 e.g. as a parameter which will also used at restore time (for cases where nfs3 is tryed by default and doesn't work)

Location:

branches/3.3

Files:

• mindi/deplist.d/drbd.conf (added)
• mondo/src/common/libmondo-cli.c (modified) (2 diffs)
• mondo/src/mondorestore/mondorestore.c (modified) (1 diff)

branches/3.3/mondo/src/common/libmondo-cli.c

@@ -484 +484 @@
                     mr_asprintf(tmp1, "mount -t cifs %s -o user=%s", bkpinfo->netfs_mount, bkpinfo->netfs_user);
                 } else if (strstr(bkpinfo->netfs_proto, "nfs")) {
-                    mr_asprintf(tmp1, "mount %s@%s", bkpinfo->netfs_user, bkpinfo->netfs_mount);
+                    mr_asprintf(tmp1, "mount -t %s %s@%s", bkpinfo->netfs_proto, bkpinfo->netfs_user, bkpinfo->netfs_mount);
                 } else {
                     log_to_screen("Protocol %s not supported yet for network backups.\n", bkpinfo->netfs_proto);
@@ -495 +495 @@
                     mr_asprintf(tmp1, "mount -t cifs %s", bkpinfo->netfs_mount);
                 } else if (strstr(bkpinfo->netfs_proto, "nfs")) {
-                    mr_asprintf(tmp1, "mount %s", bkpinfo->netfs_mount);
+                    mr_asprintf(tmp1, "mount -t %s %s", bkpinfo->netfs_proto, bkpinfo->netfs_mount);
                 } else {
                     log_to_screen("Protocol %s not supported yet for network backups.\n", bkpinfo->netfs_proto);

branches/3.3/mondo/src/mondorestore/mondorestore.c

@@ -2854 +2854 @@
                     } else {
                         if (bkpinfo->netfs_user) {
-                            mr_asprintf(tmp, "mount %s@%s -o nolock,ro /tmp/isodir", bkpinfo->netfs_user,bkpinfo->netfs_mount);
+                            mr_asprintf(tmp, "mount -t %s %s@%s -o nolock,ro /tmp/isodir", bkpinfo->netfs_proto, bkpinfo->netfs_user,bkpinfo->netfs_mount);
                         } else {
-                            mr_asprintf(tmp, "mount %s -o nolock,ro /tmp/isodir", bkpinfo->netfs_mount);
+                            mr_asprintf(tmp, "mount -t %s %s -o nolock,ro /tmp/isodir", bkpinfo->netfs_proto, bkpinfo->netfs_mount);
                         }
                     }