Changeset 2050 in MondoRescue

Timestamp:

Oct 23, 2008, 2:38:39 PM (15 years ago)

Author:

Bruno Cornec

Message:

• Do not try to create the dummy file on the NFS share when in DR mode as now the NFS share is mounted ro !

File:

• branches/2.2.8/mondo/src/common/libmondo-devices.c (modified) (1 diff)

branches/2.2.8/mondo/src/common/libmondo-devices.c

@@ -2010 +2010 @@
         // check whether writable - we better remove surrounding spaces for this
         strip_spaces(bkpinfo->nfs_remote_dir);
-        asprintf(&tmp1,"%s/%s/.dummy.txt", bkpinfo->isodir,bkpinfo->nfs_remote_dir);
-        sprintf(command, "echo hi > %s", tmp1);
-        while (run_program_and_log_output(command, FALSE)) {
-            strcpy(tmp, bkpinfo->nfs_remote_dir);
-            sprintf(prompt,
+        if (! bkpinfo->disaster_recovery) {
+            asprintf(&tmp1,"%s/%s/.dummy.txt", bkpinfo->isodir,bkpinfo->nfs_remote_dir);
+            sprintf(command, "echo hi > %s", tmp1);
+            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);
+                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);
+                paranoid_free(tmp1);
+                asprintf(&tmp1,"%s/%s/.dummy.txt", bkpinfo->isodir,bkpinfo->nfs_remote_dir);
+                sprintf(command, "echo hi > %s", tmp1);
+            }
+            unlink(tmp1);
             paranoid_free(tmp1);
-            asprintf(&tmp1,"%s/%s/.dummy.txt", bkpinfo->isodir,bkpinfo->nfs_remote_dir);
-            sprintf(command, "echo hi > %s", tmp1);
-        }
-        unlink(tmp1);
-        paranoid_free(tmp1);
+        }
 
         if (!popup_and_get_string