Changeset 1703 in MondoRescue

Timestamp:

Oct 24, 2007, 1:59:37 AM (17 years ago)

Author:

Bruno Cornec

Message:

• Add USB Key button to Menu UI (CD streamer removed)
• Attempt to fix error messages on tmp/scratch files at the end by removing those dir at the latest possible.

Location:

branches/2.2.5/mondo/src

Files:

• common/libmondo-archive.c (modified) (1 diff)
• common/newt-specific.c (modified) (5 diffs)
• mondoarchive/main.c (modified) (4 diffs)

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

@@ -984 +984 @@
                 __LINE__);
     }
-    log_to_screen(bkpinfo->tmpdir);
     sprintf(tmp, "%s/BOOTLOADER.NAME", bkpinfo->tmpdir);
     if (write_one_liner_data_file(tmp, bootldr_str)) {

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

@@ -482 +482 @@
         run_program_and_log_output("rm -Rf /mondo.scratch.* /tmp.mondo.*",
                                    FALSE);
-        if (g_erase_tmpdir_and_scratchdir) {
-            run_program_and_log_output(g_erase_tmpdir_and_scratchdir, 1);
-        }
         if (g_selfmounted_isodir) {
             sprintf(command, "umount %s", g_selfmounted_isodir);
@@ -491 +488 @@
             run_program_and_log_output(command, 1);
         }
-//  iamhere("foo");
-        /* system("clear"); */
-//  iamhere("About to call newtFinished");
         if (!g_text_mode) {
             if (does_file_exist("/THIS-IS-A-RAMDISK")) {
@@ -503 +497 @@
             }
         }
-//  system("clear");
-//  iamhere("Finished calling newtFinished");
         printf("Execution run ended; result=%d\n", signal);
         printf("Type 'less %s' to see the output log\n", MONDO_LOGFILE);
+        if (g_erase_tmpdir_and_scratchdir) {
+            system(g_erase_tmpdir_and_scratchdir);
+        }
+        paranoid_free(command);
+        paranoid_free(bkpinfo);
         free_libmondo_global_strings();
         exit(signal);
@@ -1383 +1380 @@
         b2 = newtButton(17, 1, "CD-RW disks");
         b3 = newtButton(1, 9, "Tape drive ");
-        b4 = newtButton(17, 5, "CD streamer");
+        b4 = newtButton(17, 5, "USB Key/Disk");
         b5 = newtButton(1, 5, " DVD disks ");
         b6 = newtButton(17, 9, " NFS mount ");
@@ -1401 +1398 @@
             output = tape;
         } else if (b_res == b4) {
-            output = cdstream;
+            output = usb;
         } else if (b_res == b5) {
             output = dvd;

branches/2.2.5/mondo/src/mondoarchive/main.c

@@ -529 +529 @@
         run_program_and_log_output(tmp, TRUE);
     }
-    run_program_and_log_output(g_erase_tmpdir_and_scratchdir, TRUE);
 
     run_program_and_log_output("mount", 2);
@@ -542 +541 @@
     register_pid(0, "mondo");
     set_signals(FALSE);
-    chdir("/tmp");              // just in case there's something wrong with g_erase_tmpdir_and_scratchdir
-    system(g_erase_tmpdir_and_scratchdir);
-
-    /* assemble command string for deletion of Mondo's tmp directory */
-    sprintf(tmp, "rm -Rf %s", bkpinfo->tmpdir);
-    
+
     free_libmondo_global_strings();
     paranoid_free(say_at_end);
-    paranoid_free(bkpinfo);
+    
 
     if (!g_cdrom_drive_is_here) {
@@ -562 +556 @@
     log_msg(0, "Time finished: %s", mr_date());
 
-    /* remove Mondo's tmp directory */
-    system(tmp); 
-    paranoid_free(tmp);
+    chdir("/tmp");              // just in case there's something wrong with g_erase_tmpdir_and_scratchdir
 
     if (!g_text_mode) {
@@ -570 +562 @@
             ("Mondo Archive has finished its run. Please press ENTER to return to the shell prompt.");
         log_to_screen("See %s for details of backup run.", MONDO_LOGFILE);
-        finish(retval);
     } else {
         printf("See %s for details of backup run.\n", MONDO_LOGFILE);
-        exit(retval);
-    }
+    }
+    finish(retval);
 
     return EXIT_SUCCESS;