Changeset 75 in MondoRescue for trunk/mondo/mondo/common/newt-specific.c

Timestamp:

Oct 20, 2005, 2:35:15 PM (19 years ago)

Author:

andree

Message:

Various changes to get archiving to NFS work in interactive mode. It
wasn't really like were were bugs, it appeared more like it was simply
not finished.

Side note: I believe that bkpinfo->isodir and bkpinfo->prefix were the
wrong way round in libmondo-archive.c and I've swapped them.

File:

• trunk/mondo/mondo/common/newt-specific.c (modified) (6 diffs)

trunk/mondo/mondo/common/newt-specific.c

@@ -95 +95 @@
     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.
 
 /* @} - end of globalGroup */
@@ -257 +258 @@
             "-------FATAL ERROR---------";
         char *tmp;
+        char *command;
         static bool already_exiting = FALSE;
         int i;
@@ -262 +264 @@
         /*@ end vars **************************************************** */
 
+        malloc_string(command);
         set_signals(FALSE);     // link to external func
         g_exiting = TRUE;
@@ -304 +307 @@
         if (g_erase_tmpdir_and_scratchdir[0]) {
             run_program_and_log_output(g_erase_tmpdir_and_scratchdir, 5);
+        }
+
+        if (g_selfmounted_isodir) {
+          asprintf(&command, "umount %s", g_selfmounted_isodir);
+          run_program_and_log_output(command, 5);
+          asprintf(&command, "rmdir %s", g_selfmounted_isodir);
+          run_program_and_log_output(command, 5);
         }
 
@@ -359 +369 @@
     void
      finish(int signal) {
-
-        /*  if (signal==0) { popup_and_OK("Please press <enter> to quit."); } */
+            char *command;
+            malloc_string(command);
+        
+            /*  if (signal==0) { popup_and_OK("Please press <enter> to quit."); } */
 
         /* newtPopHelpLine(); */
@@ -371 +383 @@
         if (g_erase_tmpdir_and_scratchdir) {
             run_program_and_log_output(g_erase_tmpdir_and_scratchdir, 1);
+        }
+        if (g_selfmounted_isodir) {
+          asprintf(&command, "umount %s", g_selfmounted_isodir);
+          run_program_and_log_output(command, 1);
+          asprintf(&command, "rmdir %s", g_selfmounted_isodir);
+          run_program_and_log_output(command, 1);
         }
 //  iamhere("foo");