Changeset 2380 in MondoRescue for branches/2.2.9/mondo/src/common/libmondo-cli.c

Timestamp:

Sep 9, 2009, 8:30:47 PM (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)
• Better logging to detect a potential nuke issue

File:

• branches/2.2.9/mondo/src/common/libmondo-cli.c (modified) (15 diffs)

branches/2.2.9/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 (char *mount_point);
 static MOUNTED_FS_STRUCT *find_device_in_list (char *device);
@@ -178 +178 @@
 /**
  * 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) {
@@ -195 +195 @@
 
 /**
- * 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. 
@@ -213 +213 @@
 
 /**
- * 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 
@@ -234 +234 @@
 
 /**
- * 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 
@@ -255 +255 @@
 
 /**
- * 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;
@@ -388 +388 @@
 
     /* 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);
@@ -992 +992 @@
 
     if (flag_set['n']) {
-        strncpy(bkpinfo->nfs_mount, flag_val['n'], MAX_STR_LEN);
+        strncpy(bkpinfo->netfs_mount, flag_val['n'], MAX_STR_LEN);
         if (!flag_set['d']) {
-            strncpy(bkpinfo->nfs_remote_dir, "/", MAX_STR_LEN);
-        }
-        /* test if we specified a user for the NFS dialog */
-        p = strchr(bkpinfo->nfs_mount, '@');
+            strncpy(bkpinfo->netfs_remote_dir, "/", MAX_STR_LEN);
+        }
+        /* 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 */
+            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");
+            }
+            /* new netfs mount */
+            strcpy(tmp,p);
+            p--;
+            p--;
+            p--;
+            *p = '\0';
+            mr_asprintf(&q,"%s",bkpinfo->netfs_mount);
+            bkpinfo->netfs_proto = q;
+            strcpy(bkpinfo->netfs_mount,tmp);
+        }
+        /* test if we specified a user */
+        p = strchr(bkpinfo->netfs_mount, '@');
         if (p != NULL) {
             /* User found. Store the 2 values */
             p++;
-            /* new NFS mount */
+            /* new netfs mount */
             strcpy(tmp,p);
             p--;
             *p = '\0';
-            mr_asprintf(&q,"%s",bkpinfo->nfs_mount);
-            bkpinfo->nfs_user = q;
-            strcpy(bkpinfo->nfs_mount,tmp);
+            mr_asprintf(&q,"%s",bkpinfo->netfs_mount);
+            bkpinfo->netfs_user = q;
+            strcpy(bkpinfo->netfs_mount,tmp);
         }
         sprintf(tmp, "mount | grep -E \"^%s[/]* .*\" | cut -d' ' -f3",
-                bkpinfo->nfs_mount);
+                bkpinfo->netfs_mount);
         strncpy(bkpinfo->isodir,
                 call_program_and_get_last_line_of_output(tmp),
                 MAX_STR_LEN / 4);
         if (strlen(bkpinfo->isodir) < 3) {
-            log_to_screen("NFS share is not mounted. Trying to mount it for you.\n");
-            sprintf(tmp, "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")) {
+                sprintf(tmp, "sshfs %s", bkpinfo->netfs_mount);
+            } else {
+                sprintf(tmp, "mount %s", bkpinfo->netfs_mount);
+            }
             if (system(tmp)) {
-                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 {
                 sprintf(tmp, "mount | grep -E \"^%s[/]* .*\" | cut -d' ' -f3",
-                    bkpinfo->nfs_mount);
+                    bkpinfo->netfs_mount);
                 strncpy(bkpinfo->isodir,
                         call_program_and_get_last_line_of_output(tmp),
@@ -1028 +1057 @@
                 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);
     }
@@ -1046 +1075 @@
     }
     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;
     }
@@ -1155 +1184 @@
     }
 
-    if ((flag_set['N']) && (! bkpinfo->restore_data))       // exclude NFS mounts & devices
+    if ((flag_set['N']) && (! bkpinfo->restore_data))       // exclude Network mounts & devices
     {
-//      strncpy(psz, list_of_NFS_devices_and_mounts(), MAX_STR_LEN);
-        mr_asprintf(&psz, "%s", list_of_NFS_mounts_only());
+        mr_asprintf(&psz, "%s", list_of_NETFS_mounts_only());
         if (bkpinfo->exclude_paths[0]) {
             strncat(bkpinfo->exclude_paths, " ", 4*MAX_STR_LEN);
@@ -1233 +1261 @@
     }
 
-    if (flag_set['d']) {        /* backup directory (if ISO/NFS) */
+    if (flag_set['d']) {        /* backup directory (if ISO/NETFS) */
         if (flag_set['i']) {
             strncpy(bkpinfo->isodir, flag_val['d'], MAX_STR_LEN / 4);
@@ -1242 +1270 @@
             }
         } else if (flag_set['n']) {
-            strncpy(bkpinfo->nfs_remote_dir, flag_val['d'], MAX_STR_LEN);
+            strncpy(bkpinfo->netfs_remote_dir, flag_val['d'], MAX_STR_LEN);
         } else {                /* backup device (if tape/CD-R/CD-RW) */
             strncpy(bkpinfo->media_device, flag_val['d'], MAX_STR_LEN / 4);
@@ -1249 +1277 @@
 
     if ((flag_set['n']) && (! bkpinfo->restore_data)) {
-        mr_asprintf(&tmp1,"%s/%s/.dummy.txt", bkpinfo->isodir,bkpinfo->nfs_remote_dir);
-        if (bkpinfo->nfs_user) {
-            sprintf(tmp, "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"))) {
+            sprintf(tmp, "su - %s -c \"echo hi > %s\"", bkpinfo->netfs_user, tmp1);
         } else {
             sprintf(tmp, "echo hi > %s", tmp1);
@@ -1259 +1287 @@
             sprintf(tmp,
                     "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);
+                    bkpinfo->netfs_remote_dir, bkpinfo->netfs_mount);
             log_to_screen(tmp);
         }