Changeset 2382 in MondoRescue for branches/2.2.10/mondo/src/common/libmondo-cli.c

Timestamp:

Sep 10, 2009, 2:07:16 AM (15 years ago)

Author:

Bruno Cornec

Message:

• Change NFS support into a NetFS support to allow for multiple protocol in addition to NFS (NEEDS TESTING)

(Backport from 2.2.9)

File:

• branches/2.2.10/mondo/src/common/libmondo-cli.c (modified) (16 diffs)

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

@@ -55 +55 @@
 static void free_mounted_fs_list (void);
 static int get_dsf_mount_list (const char *dsf, char **included_dsf_list, char **excluded_dsf_list);
-static int create_list_of_non_NFS_mounted_file_systems (void);
+static int create_list_of_non_NETFS_mounted_file_systems (void);
 static MOUNTED_FS_STRUCT *find_mount_point_in_list (const char *mount_point);
 static MOUNTED_FS_STRUCT *find_device_in_list (const char *device);
@@ -162 +162 @@
 /**
  * Frees the memory for all of the structures on the linked list of 
- * all of the non-NFS mounted file systems.
+ * all of the non-NETFS mounted file systems.
  */
 static void free_mounted_fs_list (void) {
@@ -179 +179 @@
 
 /**
- * Creates a singly linked list of all of the non-NFS mounted file systems.
+ * Creates a singly linked list of all of the non-NETFS mounted file systems.
  * @param DSFptr A pointer  to the structure MOUNTED_FS_STRUCT used to hold 
  * the list of mounted file systems. 
@@ -197 +197 @@
 
 /**
- * Find the structure, in the singly linked list of all of the non-NFS 
+ * Find the structure, in the singly linked list of all of the non-NETFS 
  * mounted file systems, that contains the specified device.
  * @param device The device to find 
@@ -218 +218 @@
 
 /**
- * Find the structure, in the singly linked list of all of the non-NFS 
+ * Find the structure, in the singly linked list of all of the non-NETFS 
  * mounted file systems, that contains the specified mount point.
  * @param mount_point The mount point to find 
@@ -239 +239 @@
 
 /**
- * Creates a linked list of all of the non-NFS mounted file systems.
+ * Creates a linked list of all of the non-NETFS mounted file systems.
  * We use a linked list because we don't know how many  mounted file
  * there are (and there can be a lot).
  * @return 0 on success and greated than 0 on failure. 
  */
-static int create_list_of_non_NFS_mounted_file_systems (void)
+static int create_list_of_non_NETFS_mounted_file_systems (void)
 {
     int i = 0;
@@ -372 +372 @@
 
     /* Get a list of the mounted file systems */
-    if (create_list_of_non_NFS_mounted_file_systems()) {
+    if (create_list_of_non_NETFS_mounted_file_systems()) {
         log_to_screen ("Could not get the list of mounted file systems");
         return (1);
@@ -967 +967 @@
 
     if (flag_set['n']) {
-        mr_free(bkpinfo->nfs_mount);
-        mr_asprintf(bkpinfo->nfs_mount, "%s", flag_val['n']);
+        mr_free(bkpinfo->netfs_mount);
+        mr_asprintf(bkpinfo->netfs_mount, "%s", flag_val['n']);
         if (!flag_set['d']) {
-            mr_free(bkpinfo->nfs_remote_dir);
-            mr_asprintf(bkpinfo->nfs_remote_dir, "/");
-        }
-        /* test if we specified a user for the NFS dialog */
-        p = strchr(bkpinfo->nfs_mount, '@');
+            mr_free(bkpinfo->netfs_remote_dir);
+            mr_asprintf(bkpinfo->netfs_remote_dir, "/");
+        }
+        /* test for protocol */
+        p = strchr(bkpinfo->netfs_mount, ':');
+        if (p == NULL) {
+            /* protocol not found abort */
+            fatal_error("No protocol specified for remote share mount. Please do man mondoarchive as syntax changed");
+        } else {
+            /* Proto found. Store the 2 values */
+            bkpinfo->netfs_proto = bkpinfo->netfs_mount;
+            p++;
+            if (*p != '/') {
+                fatal_error("No protocol correctly specified for remote share mount. Use protocol://server:share");
+            }
+            p++;
+            if (*p != '/') {
+                fatal_error("No protocol correctly specified for remote share mount. Use protocol://server:share");
+            }
+            bkpinfo->netfs_mount = p;
+            /* new netfs mount - remove :// from proto */
+            p--;
+            p--;
+            p--;
+            *p = '\0';
+        }
+        /* test if we specified a user */
+        p = strchr(bkpinfo->netfs_mount, '@');
         if (p != NULL) {
             /* User found. Store the 2 values */
-            bkpinfo->nfs_user = bkpinfo->nfs_mount;
+            bkpinfo->netfs_user = bkpinfo->netfs_mount;
             p++;
-            /* new NFS mount */
-            bkpinfo->nfs_mount = p;
+            /* new netfs mount */
+            bkpinfo->netfs_mount = p;
             p--;
             *p = '\0';
         }
-        mr_asprintf(tmp1, "mount | grep -E \"^%s[/]* .*\" | cut -d' ' -f3", bkpinfo->nfs_mount);
+        mr_asprintf(tmp1, "mount | grep -E \"^%s[/]* .*\" | cut -d' ' -f3", bkpinfo->netfs_mount);
         mr_free(bkpinfo->isodir);
         mr_asprintf(bkpinfo->isodir, "%s", call_program_and_get_last_line_of_output(tmp1));
@@ -990 +1013 @@
 
         if (strlen(bkpinfo->isodir) < 3) {
-            log_to_screen("NFS share is not mounted. Trying to mount it for you.\n");
-            mr_asprintf(tmp1, "mount %s", bkpinfo->nfs_mount);
+            log_to_screen("Network share is not mounted. Trying to mount it for you.\n");
+            if (strstr(bkpinfo->netfs_proto, "sshfs")) {
+                mr_asprintf(tmp1, "sshfs %s", bkpinfo->netfs_mount);
+            } else {
+                mr_asprintf(tmp1, "mount %s", bkpinfo->netfs_mount);
+            }
             i = system(tmp1);
             mr_free(tmp1);
             if (i) {
-                log_to_screen("Unable to mount NFS share %s. Please mount manually.\n", bkpinfo->nfs_mount);
+                log_to_screen("Unable to mount Network share %s. Please mount manually.\n", bkpinfo->netfs_mount);
                 retval++;
             } else {
-                mr_asprintf(tmp1, "mount | grep -E \"^%s[/]* .*\" | cut -d' ' -f3", bkpinfo->nfs_mount);
+                mr_asprintf(tmp1, "mount | grep -E \"^%s[/]* .*\" | cut -d' ' -f3", bkpinfo->netfs_mount);
                 mr_free(bkpinfo->isodir);
                 mr_asprintf(bkpinfo->isodir, "%s", call_program_and_get_last_line_of_output(tmp1));
@@ -1005 +1032 @@
                 if (strlen(bkpinfo->isodir) < 3) {
                     retval++;
-                    log_to_screen("NFS share %s is strangely not mounted. Please mount manually...\n", bkpinfo->nfs_mount);
+                    log_to_screen("Network share %s is strangely not mounted. Please mount manually...\n", bkpinfo->netfs_mount);
                 }
             }
         }
-        log_msg(3, "mount = %s", bkpinfo->nfs_mount);
+        log_msg(3, "mount = %s", bkpinfo->netfs_mount);
         log_msg(3, "isodir= %s", bkpinfo->isodir);
     }
@@ -1023 +1050 @@
     }
     if (flag_set['n']) {
-        bkpinfo->backup_media_type = nfs;
-        /* Never try to eject a NFS device */
+        bkpinfo->backup_media_type = netfs;
+        /* Never try to eject a Network device */
         bkpinfo->please_dont_eject = TRUE;
     }
@@ -1134 +1161 @@
     }
 
-    if ((flag_set['N']) && (! bkpinfo->restore_data))       // exclude NFS mounts & devices
+    if ((flag_set['N']) && (! bkpinfo->restore_data))       // exclude Network mounts & devices
     {
-        mr_asprintf(psz, "%s", list_of_NFS_mounts_only());
+        mr_asprintf(psz, "%s", list_of_NETFS_mounts_only());
         mr_strcat(bkpinfo->exclude_paths, " %s ", psz);
         mr_free(psz);
@@ -1201 +1228 @@
     }
 
-    if (flag_set['d']) {        /* backup directory (if ISO/NFS) */
+    if (flag_set['d']) {        /* backup directory (if ISO/NETFS) */
         if (flag_set['i']) {
             mr_free(bkpinfo->isodir);
@@ -1212 +1239 @@
             mr_free(tmp1);
         } else if (flag_set['n']) {
-            mr_free(bkpinfo->nfs_remote_dir);
-            mr_asprintf(bkpinfo->nfs_remote_dir, "%s", flag_val['d']);
+            mr_free(bkpinfo->netfs_remote_dir);
+            mr_asprintf(bkpinfo->netfs_remote_dir, "%s", flag_val['d']);
         } else {                /* backup device (if tape/CD-R/CD-RW) */
             mr_free(bkpinfo->media_device);
@@ -1221 +1248 @@
 
     if ((flag_set['n']) && (! bkpinfo->restore_data)) {
-        mr_asprintf(tmp1,"%s/%s/.dummy.txt", bkpinfo->isodir,bkpinfo->nfs_remote_dir);
-        if (bkpinfo->nfs_user) {
-            mr_asprintf(tmp2, "su - %s -c \"echo hi > %s\"", bkpinfo->nfs_user, tmp1);
+        mr_asprintf(tmp1,"%s/%s/.dummy.txt", bkpinfo->isodir,bkpinfo->netfs_remote_dir);
+        if ((bkpinfo->netfs_user) && (strstr(bkpinfo->netfs_proto,"nfs"))) {
+            mr_asprintf(tmp2, "su - %s -c \"echo hi > %s\"", bkpinfo->netfs_user, tmp1);
         } else {
             mr_asprintf(tmp2, "echo hi > %s", tmp1);
@@ -1232 +1259 @@
         if (i) {
             retval++;
-            log_to_screen(tmp2, "Are you sure directory '%s' exists in remote dir '%s'?\nIf so, do you have rights to write to it?\n", bkpinfo->nfs_remote_dir, bkpinfo->nfs_mount);
+            log_to_screen(tmp2, "Are you sure directory '%s' exists in remote dir '%s'?\nIf so, do you have rights to write to it?\n", bkpinfo->netfs_remote_dir, bkpinfo->netfs_mount);
         }
         unlink(tmp1);