Changeset 1708 in MondoRescue for branches/2.2.5/mondo/src/common/newt-specific.c

Timestamp:

Oct 27, 2007, 4:42:34 PM (16 years ago)

Author:

Bruno Cornec

Message:

• Supress g_erase_tmpdir_and_scratchdir
• Improve some log messages for USB support
• Try to improve install in mindi to avoid issues with isolinux.cfg not installed vene if in the pkg :-(

File:

• branches/2.2.5/mondo/src/common/newt-specific.c (modified) (5 diffs)

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

@@ -191 +191 @@
      g_xmondo_stdout[MAX_NEWT_COMMENT_LEN]; ///< .... @bug Unneeded w/current XMondo.
     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.
 
@@ -420 +419 @@
         }
 
-        if (g_erase_tmpdir_and_scratchdir[0]) {
-            run_program_and_log_output(g_erase_tmpdir_and_scratchdir, 5);
-        }
-
         if (g_selfmounted_isodir) {
             sprintf(command, "umount %s", g_selfmounted_isodir);
@@ -470 +465 @@
     void
      finish(int signal) {
-        char *command;
-        malloc_string(command);
+        char *command = NULL;
 
         /*  if (signal==0) { popup_and_OK("Please press <enter> to quit."); } */
@@ -483 +477 @@
                                    FALSE);
         if (g_selfmounted_isodir) {
-            sprintf(command, "umount %s", g_selfmounted_isodir);
+            asprintf(&command, "umount %s", g_selfmounted_isodir);
             run_program_and_log_output(command, 1);
-            sprintf(command, "rmdir %s", g_selfmounted_isodir);
+            paranoid_free(command);
+            asprintf(&command, "rmdir %s", g_selfmounted_isodir);
             run_program_and_log_output(command, 1);
+            paranoid_free(command);
         }
         if (!g_text_mode) {
@@ -499 +495 @@
         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);
-        }
+        asprintf(&command, "rm -Rf %s %s", bkpinfo->tmpdir, bkpinfo->scratchdir);
+        system(command);
         paranoid_free(command);
         paranoid_free(bkpinfo);