Changeset 75 in MondoRescue

Timestamp:

Oct 20, 2005, 2:35:15 PM (20 years ago)

Author:

andree

Message:

Various changes to get archiving to NFS work in interactive mode. It
wasn't really like were were bugs, it appeared more like it was simply
not finished.

Side note: I believe that bkpinfo->isodir and bkpinfo->prefix were the
wrong way round in libmondo-archive.c and I've swapped them.

Location:

trunk/mondo/mondo/common

Files:

• libmondo-archive.c (modified) (1 diff)
• libmondo-devices.c (modified) (7 diffs)
• libmondo-tools.c (modified) (1 diff)
• newt-specific.c (modified) (6 diffs)

trunk/mondo/mondo/common/libmondo-archive.c

@@ -1217 +1217 @@
     paranoid_free(data_disks_file);
 
-    asprintf(&command, "rm -f %s/%s-[1-9]*.iso", bkpinfo->prefix,
-             bkpinfo->isodir);
+    asprintf(&command, "rm -f %s/%s/%s-[1-9]*.iso", bkpinfo->isodir,
+                 bkpinfo->nfs_remote_dir, bkpinfo->prefix);
     paranoid_system(command);
     paranoid_free(command);

trunk/mondo/mondo/common/libmondo-devices.c

@@ -260 +260 @@
 extern struct s_bkpinfo *g_bkpinfo_DONTUSETHIS;
 extern char *g_erase_tmpdir_and_scratchdir;
+extern char *g_selfmounted_isodir;
 
 static char g_cdrw_drive_is_here[MAX_STR_LEN / 4] = "";
@@ -1820 +1821 @@
     char *command;
     char *comment;
+    char *prompt;
     int i;
     FILE *fin;
@@ -1827 +1829 @@
     malloc_string(command);
     malloc_string(comment);
+    malloc_string(prompt);
     assert(bkpinfo != NULL);
     sz_size[0] = '\0';
@@ -2099 +2102 @@
                 }
             }
-            sprintf(command, "mount | grep %s | cut -d' ' -f3",
-                    bkpinfo->nfs_mount);
+            // check whether already mounted - we better remove
+                        // surrounding spaces and trailing '/' for this
+            strip_spaces (bkpinfo->nfs_mount);
+            if (bkpinfo->nfs_mount[strlen(bkpinfo->nfs_mount) - 1] == '/')
+              bkpinfo->nfs_mount[strlen(bkpinfo->nfs_mount) - 1] = '\0';
+            sprintf(command, "mount | grep \"%s \" | cut -d' ' -f3",
+                   bkpinfo->nfs_mount);
             strcpy(bkpinfo->isodir,
                    call_program_and_get_last_line_of_output(command));
@@ -2114 +2122 @@
         }
         if (!is_this_device_mounted(bkpinfo->nfs_mount)) {
-            sprintf(bkpinfo->isodir, "/tmp/isodir");
-            run_program_and_log_output("mkdir -p /tmp/isodir", 5);
-            sprintf(tmp, "mount %s -t nfs -o nolock /tmp/isodir",
-                    bkpinfo->nfs_mount);
-            run_program_and_log_output(tmp, 5);
+          sprintf(bkpinfo->isodir, "/tmp/isodir.mondo.%d", (int)(random()%32768));
+          sprintf(command, "mkdir -p %s", bkpinfo->isodir);
+          run_program_and_log_output(command, 5);
+          sprintf(tmp, "mount %s -t nfs %s", bkpinfo->nfs_mount, bkpinfo->isodir);
+          run_program_and_log_output(tmp, 5);
+          malloc_string(g_selfmounted_isodir);
+          strcpy(g_selfmounted_isodir, bkpinfo->isodir);
         }
         if (!is_this_device_mounted(bkpinfo->nfs_mount)) {
@@ -2133 +2143 @@
         }
         strcpy(bkpinfo->nfs_remote_dir, tmp);
+        // check whether writable - we better remove surrounding spaces for this
+        strip_spaces (bkpinfo->nfs_remote_dir);
+        sprintf (command, "echo hi > %s/%s/.dummy.txt", bkpinfo->isodir,
+                      bkpinfo->nfs_remote_dir);
+        while (run_program_and_log_output (command, FALSE)) {
+          strcpy(tmp, bkpinfo->nfs_remote_dir);
+          asprintf (&prompt,
+                "Directory '%s' under mountpoint '%s' does not exist or is not writable. You can fix this or change the directory and retry or cancel the backup.",
+                bkpinfo->nfs_remote_dir, bkpinfo->isodir);
+          if(!popup_and_get_string ("Directory", prompt, tmp, MAX_STR_LEN)) {
+            log_to_screen("User has chosen not to backup the PC");
+            finish(1);
+          }
+          strcpy(bkpinfo->nfs_remote_dir, tmp);
+          // check whether writable - we better remove surrounding spaces for this */
+          strip_spaces (bkpinfo->nfs_remote_dir);
+          asprintf (&command, "echo hi > %s/%s/.dummy.txt", bkpinfo->isodir,
+                        bkpinfo->nfs_remote_dir);
+        }
         for (i = 0; i <= MAX_NOOF_MEDIA; i++) {
             bkpinfo->media_size[i] = 650;
@@ -2347 +2376 @@
     paranoid_free(command);
     paranoid_free(comment);
+    paranoid_free(prompt);
     return (0);
 }

trunk/mondo/mondo/common/libmondo-tools.c

@@ -712 +712 @@
             }
         }
+        store_nfs_config (bkpinfo);
     }
 

trunk/mondo/mondo/common/newt-specific.c

@@ -95 +95 @@
     bool g_called_by_xmondo = FALSE;    ///< @bug Unneeded w/current XMondo.
     char *g_erase_tmpdir_and_scratchdir;    ///< The command to run to erase the tmpdir and scratchdir at the end of Mondo.
+char *g_selfmounted_isodir; ///< Holds the NFS mountpoint if mounted via mondoarchive.
 
 /* @} - end of globalGroup */
@@ -257 +258 @@
             "-------FATAL ERROR---------";
         char *tmp;
+        char *command;
         static bool already_exiting = FALSE;
         int i;
@@ -262 +264 @@
         /*@ end vars **************************************************** */
 
+        malloc_string(command);
         set_signals(FALSE);     // link to external func
         g_exiting = TRUE;
@@ -304 +307 @@
         if (g_erase_tmpdir_and_scratchdir[0]) {
             run_program_and_log_output(g_erase_tmpdir_and_scratchdir, 5);
+        }
+
+        if (g_selfmounted_isodir) {
+          asprintf(&command, "umount %s", g_selfmounted_isodir);
+          run_program_and_log_output(command, 5);
+          asprintf(&command, "rmdir %s", g_selfmounted_isodir);
+          run_program_and_log_output(command, 5);
         }
 
@@ -359 +369 @@
     void
      finish(int signal) {
-
-        /*  if (signal==0) { popup_and_OK("Please press <enter> to quit."); } */
+            char *command;
+            malloc_string(command);
+        
+            /*  if (signal==0) { popup_and_OK("Please press <enter> to quit."); } */
 
         /* newtPopHelpLine(); */
@@ -371 +383 @@
         if (g_erase_tmpdir_and_scratchdir) {
             run_program_and_log_output(g_erase_tmpdir_and_scratchdir, 1);
+        }
+        if (g_selfmounted_isodir) {
+          asprintf(&command, "umount %s", g_selfmounted_isodir);
+          run_program_and_log_output(command, 1);
+          asprintf(&command, "rmdir %s", g_selfmounted_isodir);
+          run_program_and_log_output(command, 1);
         }
 //  iamhere("foo");