Ignore:
Timestamp:
Oct 27, 2007, 4:42:34 PM (12 years ago)
Author:
bruno
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:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/2.2.5/mondo/src/common/newt-specific.c

    r1703 r1708  
    191191     g_xmondo_stdout[MAX_NEWT_COMMENT_LEN]; ///< .... @bug Unneeded w/current XMondo.
    192192    bool g_called_by_xmondo = FALSE;    ///< @bug Unneeded w/current XMondo.
    193     char *g_erase_tmpdir_and_scratchdir;    ///< The command to run to erase the tmpdir and scratchdir at the end of Mondo.
    194193    char *g_selfmounted_isodir; ///< Holds the NFS mountpoint if mounted via mondoarchive.
    195194
     
    420419        }
    421420
    422         if (g_erase_tmpdir_and_scratchdir[0]) {
    423             run_program_and_log_output(g_erase_tmpdir_and_scratchdir, 5);
    424         }
    425 
    426421        if (g_selfmounted_isodir) {
    427422            sprintf(command, "umount %s", g_selfmounted_isodir);
     
    470465    void
    471466     finish(int signal) {
    472         char *command;
    473         malloc_string(command);
     467        char *command = NULL;
    474468
    475469        /*  if (signal==0) { popup_and_OK("Please press <enter> to quit."); } */
     
    483477                                   FALSE);
    484478        if (g_selfmounted_isodir) {
    485             sprintf(command, "umount %s", g_selfmounted_isodir);
     479            asprintf(&command, "umount %s", g_selfmounted_isodir);
    486480            run_program_and_log_output(command, 1);
    487             sprintf(command, "rmdir %s", g_selfmounted_isodir);
     481            paranoid_free(command);
     482            asprintf(&command, "rmdir %s", g_selfmounted_isodir);
    488483            run_program_and_log_output(command, 1);
     484            paranoid_free(command);
    489485        }
    490486        if (!g_text_mode) {
     
    499495        printf("Execution run ended; result=%d\n", signal);
    500496        printf("Type 'less %s' to see the output log\n", MONDO_LOGFILE);
    501         if (g_erase_tmpdir_and_scratchdir) {
    502             system(g_erase_tmpdir_and_scratchdir);
    503         }
     497        asprintf(&command, "rm -Rf %s %s", bkpinfo->tmpdir, bkpinfo->scratchdir);
     498        system(command);
    504499        paranoid_free(command);
    505500        paranoid_free(bkpinfo);
Note: See TracChangeset for help on using the changeset viewer.