Ignore:
Timestamp:
Nov 5, 2005, 12:51:05 AM (14 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:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/2.04_berlios/mondo/mondo/common/newt-specific.c

    r30 r99  
    11/* newt-specific.c
    2    $Id: newt-specific.c,v 1.8 2004/06/10 17:13:33 hugo Exp $
     2   $Id$
    33
    44  subroutines which do display-type things
     
    122122
    123123/*@unused@*/
    124 //static char cvsid[] = "$Id: newt-specific.c,v 1.8 2004/06/10 17:13:33 hugo Exp $";
     124//static char cvsid[] = "$Id$";
    125125
    126126extern pid_t g_mastermind_pid;
     
    188188bool g_called_by_xmondo=FALSE; ///< @bug Unneeded w/current XMondo.
    189189char *g_erase_tmpdir_and_scratchdir; ///< The command to run to erase the tmpdir and scratchdir at the end of Mondo.
     190char *g_selfmounted_isodir; ///< Holds the NFS mountpoint if mounted via mondoarchive.
    190191
    191192/* @} - end of globalGroup */
     
    363364  char fatalstr[MAX_NEWT_COMMENT_LEN] = "-------FATAL ERROR---------";
    364365  char *tmp;
     366  char *command;
    365367  static bool already_exiting=FALSE;
    366368  int i;
     
    368370    /*@ end vars *****************************************************/
    369371
     372  malloc_string(command);
    370373  tmp = malloc(MAX_NEWT_COMMENT_LEN);
    371374  set_signals(FALSE); // link to external func
     
    419422    { run_program_and_log_output(g_erase_tmpdir_and_scratchdir, 5); }
    420423
     424  if (g_selfmounted_isodir) {
     425    sprintf(command, "umount %s", g_selfmounted_isodir);
     426    run_program_and_log_output(command, 5);
     427    sprintf(command, "rmdir %s", g_selfmounted_isodir);
     428    run_program_and_log_output(command, 5);
     429    }
     430
    421431  if (!g_text_mode)
    422432    {
     
    454464  if (!g_main_pid) { log_msg(3, "FYI - g_main_pid is blank"); }
    455465  paranoid_free(tmp);
     466  paranoid_free(command);
    456467  finish (254);
    457468}
     
    468479finish (int signal)
    469480{
     481        char *command;
     482        malloc_string(command);
    470483
    471484  /*  if (signal==0) { popup_and_OK("Please press <enter> to quit."); } */
     
    481494      run_program_and_log_output(g_erase_tmpdir_and_scratchdir, 1);
    482495    }
     496  if (g_selfmounted_isodir) {
     497    sprintf(command, "umount %s", g_selfmounted_isodir);
     498    run_program_and_log_output(command, 1);
     499    sprintf(command, "rmdir %s", g_selfmounted_isodir);
     500    run_program_and_log_output(command, 1);
     501    }
    483502   
    484503//  iamhere("foo");
Note: See TracChangeset for help on using the changeset viewer.