Changeset 2907 in MondoRescue

Timestamp:

Nov 29, 2011, 2:58:39 AM (13 years ago)

Author:

Bruno Cornec

Message:

• Should fix #512 by clearing old scratchdir before changing to a new

Location:

branches/3.0

Files:

• mindi/mindi (modified) (2 diffs)
• mondo/src/common/libmondo-archive.c (modified) (2 diffs)
• mondo/src/common/libmondo-cli.c (modified) (2 diffs)
• mondo/src/common/libmondo-devices.c (modified) (1 diff)
• mondo/src/common/libmondo-tools.c (modified) (1 diff)
• mondo/src/common/newt-specific.c (modified) (3 diffs)

branches/3.0/mindi/mindi

@@ -1026 +1026 @@
 
 MakeMountlist() {
-    local scratchdir mountlist all_partitions current_partition \
+    local mountlist all_partitions current_partition \
 partition_size partition_format outstring partition_number \
 partition_mountpt c_p lwm_info psz lvm_dev unofficial_outstring \
@@ -1037 +1037 @@
     echo "-----------------------------------" >> $LOGFILE
 
-# scratchdir, mountlist(OUT)
-    scratchdir=$MINDI_TMP
+# mountlist(OUT)
     mountlist=$1
 

branches/3.0/mondo/src/common/libmondo-archive.c

@@ -1582 +1582 @@
     log_msg(2, "make_usb_fs --- scratchdir=%s", bkpinfo->scratchdir);
     (void) getcwd(old_pwd, MAX_STR_LEN - 1);
-    mr_asprintf(&tmp, "chmod 755 %s", bkpinfo->scratchdir);
+    mr_asprintf(&tmp, "chmod 700 %s", bkpinfo->scratchdir);
     run_program_and_log_output(tmp, FALSE);
     paranoid_free(tmp);
@@ -1719 +1719 @@
             bkpinfo->scratchdir, destfile);
     (void) getcwd(old_pwd, MAX_STR_LEN - 1);
-    sprintf(tmp, "chmod 744 %s", bkpinfo->scratchdir);
+    sprintf(tmp, "chmod 700 %s", bkpinfo->scratchdir);
     run_program_and_log_output(tmp, FALSE);
     chdir(bkpinfo->scratchdir);

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

@@ -106 +106 @@
     }
 //    }
+    /*  Before erasing dirs go into a safe place */
+    chdir("/tmp");
     sprintf(tmp, "rm -Rf %s/tmp.mondo.*", bkpinfo->tmpdir);
     paranoid_system(tmp);
@@ -808 +810 @@
 
     if (flag_set['S']) {
+        /* Before changing remove old ones if any */
+        if (bkpinfo->scratchdir) {
+            chdir("/tmp");
+            mr_asprintf(&tmp, "rm -Rf %s", bkpinfo->scratchdir);
+            paranoid_system(tmp);
+            mr_free(tmp);
+        }
         sprintf(bkpinfo->scratchdir, "%s/mondo.scratch.%ld", flag_val['S'],
                 random() % 32768);

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

@@ -2973 +2973 @@
     log_it("bkpinfo->tmpdir is being set to %s", bkpinfo->tmpdir);
 
+    /* Before changing remove old ones if any */
+    if (bkpinfo->scratchdir) {
+        chdir("/tmp");
+        mr_asprintf(&tmp, "rm -Rf %s", bkpinfo->scratchdir);
+        paranoid_system(tmp);
+        mr_free(tmp);
+    }
     sprintf(bkpinfo->scratchdir, "%s/mondo.scratch.%d", tmp,
             (int) (random() % 32768));

branches/3.0/mondo/src/common/libmondo-tools.c

@@ -733 +733 @@
         /* purging a potential old tmpdir */
         log_it("Purging old tmpdir %s", bkpinfo->tmpdir);
+        chdir("/tmp");
         mr_asprintf(&tmp,"rm -Rf %s",bkpinfo->tmpdir);
         (void)system(tmp);

branches/3.0/mondo/src/common/newt-specific.c

@@ -405 +405 @@
         /* newtPopHelpLine(); */
 
-        chdir("/");
+        /*  Before removing dir, make sure we're out of them */ */
+        chdir("/tmp");
         run_program_and_log_output("umount -d " MNT_CDROM, FALSE);
         if (g_selfmounted_isodir) {
@@ -429 +430 @@
             log_msg(8,"tempdir is %s",bkpinfo->tmpdir);
             if (strstr(bkpinfo->tmpdir ,"mondo.tmp.") != NULL) {
-                log_msg(8,"erasing tempdir");
+                log_msg(8,"erasing tempdir %s",bkpinfo->tmpdir);
                 mr_asprintf(&command, "rm -Rf %s", bkpinfo->tmpdir);
                 system(command);
@@ -438 +439 @@
             log_msg(8,"scratchdir is %s", bkpinfo->scratchdir);
             if (strstr(bkpinfo->scratchdir ,"mondo.scratch.") != NULL) {
-                log_msg(8,"erasing scratchdir");
+                log_msg(8,"erasing scratchdir %s",bkpinfo->scratchdir);
                 mr_asprintf(&command, "rm -Rf %s", bkpinfo->scratchdir);
                 system(command);