Changeset 99 in MondoRescue for branches/2.04_berlios/mondo/mondo/common/libmondo-devices.c

Timestamp:

Nov 5, 2005, 12:51:05 AM (18 years ago)

Author:

bcornec

Message:

Apply patch from Andree Leidenfrost <aleidenf_AT_bigpond.net.au>
(-r72:75 of trunk) for :
+ correcting NFS handling in interactive mode
+ growisofs and sudo pb

File:

• branches/2.04_berlios/mondo/mondo/common/libmondo-devices.c (modified) (7 diffs)

branches/2.04_berlios/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]="";
@@ -1786 +1787 @@
   char *command;
   char *comment;
+  char *prompt;
   int i;
   FILE*fin;
@@ -1793 +1795 @@
   malloc_string(command);
   malloc_string(comment);
+  malloc_string(prompt);
   assert(bkpinfo!=NULL);
   sz_size[0] = '\0';
@@ -2002 +2005 @@
                   }
               }
-            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));
       }
@@ -2016 +2024 @@
         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))
@@ -2033 +2044 @@
           }
         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);
+            sprintf (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 space s for this
+            strip_spaces (bkpinfo->nfs_remote_dir);
+            sprintf (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; }
         log_msg(3, "Just set nfs_remote_dir to %s", bkpinfo->nfs_remote_dir);
@@ -2181 +2212 @@
   paranoid_free(command);
   paranoid_free(comment);
+  paranoid_free(prompt);
   return(0);
 }