Changeset 99 in MondoRescue for branches/2.04_berlios/mondo/mondo/common/newt-specific.c

Timestamp:

Nov 5, 2005, 12:51:05 AM (18 years ago)

Author:

bcornec

Message:

Apply patch from Andree Leidenfrost <aleidenf_AT_bigpond.net.au>
(-r72:75 of trunk) for :
+ correcting NFS handling in interactive mode
+ growisofs and sudo pb

File:

• branches/2.04_berlios/mondo/mondo/common/newt-specific.c (modified) (9 diffs)

branches/2.04_berlios/mondo/mondo/common/newt-specific.c

@@ -1 +1 @@
 /* newt-specific.c
-   $Id: newt-specific.c,v 1.8 2004/06/10 17:13:33 hugo Exp $
+   $Id$
 
   subroutines which do display-type things
@@ -122 +122 @@
 
 /*@unused@*/
-//static char cvsid[] = "$Id: newt-specific.c,v 1.8 2004/06/10 17:13:33 hugo Exp $";
+//static char cvsid[] = "$Id$";
 
 extern pid_t g_mastermind_pid;
@@ -188 +188 @@
 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 */
@@ -363 +364 @@
   char fatalstr[MAX_NEWT_COMMENT_LEN] = "-------FATAL ERROR---------";
   char *tmp;
+  char *command;
   static bool already_exiting=FALSE;
   int i;
@@ -368 +370 @@
     /*@ end vars *****************************************************/
 
+  malloc_string(command);
   tmp = malloc(MAX_NEWT_COMMENT_LEN);
   set_signals(FALSE); // link to external func
@@ -419 +422 @@
     { run_program_and_log_output(g_erase_tmpdir_and_scratchdir, 5); }
 
+  if (g_selfmounted_isodir) {
+    sprintf(command, "umount %s", g_selfmounted_isodir);
+    run_program_and_log_output(command, 5);
+    sprintf(command, "rmdir %s", g_selfmounted_isodir);
+    run_program_and_log_output(command, 5);
+    }
+
   if (!g_text_mode)
     {
@@ -454 +464 @@
   if (!g_main_pid) { log_msg(3, "FYI - g_main_pid is blank"); }
   paranoid_free(tmp);
+  paranoid_free(command);
   finish (254);
 }
@@ -468 +479 @@
 finish (int signal)
 {
+        char *command;
+        malloc_string(command);
 
   /*  if (signal==0) { popup_and_OK("Please press <enter> to quit."); } */
@@ -481 +494 @@
       run_program_and_log_output(g_erase_tmpdir_and_scratchdir, 1);
     }
+  if (g_selfmounted_isodir) {
+    sprintf(command, "umount %s", g_selfmounted_isodir);
+    run_program_and_log_output(command, 1);
+    sprintf(command, "rmdir %s", g_selfmounted_isodir);
+    run_program_and_log_output(command, 1);
+    }
     
 //  iamhere("foo");