Changeset 1670 for branches/stable


Ignore:
Timestamp:
Oct 1, 2007, 12:50:28 PM (12 years ago)
Author:
bruno
Message:
  • Try to fix the issue with large exclude list (> 1000 chars) Some variables created after exclude_path (indirectly) were not sized big enough to handle them.
  • Remove useless .keep file
  • remove temporary.iso name remaining and suppress a warning in log trying to remove it in the tmpdir
  • missing extern bkpinfo in newt-specific.c
  • Attempt to fix #191 (allow edition of mountlist in compare mode)

(merge -r1662:1669 $SVN_M/branches/2.2.5)

Location:
branches/stable
Files:
1 deleted
5 edited

Legend:

Unmodified
Added
Removed
  • branches/stable/mondo/src/common/libmondo-filelist.c

    r1663 r1670  
    13191319    time_t this_time;
    13201320
    1321     malloc_string(sth_B);
     1321    sth_B = malloc(8*MAX_STR_LEN);
    13221322    malloc_string(ith_B);
    13231323    malloc_string(new_with_spaces);
  • branches/stable/mondo/src/common/libmondo-tools.c

    r1669 r1670  
    488488            if (bkpinfo->call_before_iso[0] == '\0') {
    489489                sprintf(bkpinfo->call_before_iso,
    490                         "%s %s -o %s/temporary.iso . 2>> %s",
     490                        "%s %s -o %s/"MONDO_TMPISOS" . 2>> %s",
    491491                        mr_conf->iso_creation_cmd,mondo_mkisofs_sz, bkpinfo->tmpdir, MONDO_LOGFILE);
    492492            } else {
    493493                mr_asprintf(&call_before_iso_user, bkpinfo->call_before_iso);
    494494                sprintf (bkpinfo->call_before_iso,
    495                                     "(%s %s -o %s/temporary.iso . 2>> %s ; %s )",
     495                                    "(%s %s -o %s/"MONDO_TMPISOS" . 2>> %s ; %s )",
    496496                        mr_conf->iso_creation_cmd,mondo_mkisofs_sz, bkpinfo->tmpdir, MONDO_LOGFILE, call_before_iso_user);
    497497                mr_free(call_before_iso_user);
     
    499499            log_it("bkpinfo->call_before_iso = %s", bkpinfo->call_before_iso);
    500500            sprintf(bkpinfo->call_make_iso,
    501                     "%s %s %s dev=%s speed=%d %s/temporary.iso",
     501                    "%s %s %s dev=%s speed=%d %s/"MONDO_TMPISOS,
    502502                    mr_conf->iso_burning_cmd,
    503503                    extra_cdrom_params,
  • branches/stable/mondo/src/common/newt-specific.c

    r1663 r1670  
    3535
    3636extern char *MONDO_LOGFILE;
     37
     38extern struct s_bkpinfo *bkpinfo;
    3739
    3840/*@unused@*/
  • branches/stable/mondo/src/include/my-stuff.h

    r1663 r1670  
    151151 */
    152152#define IS_THIS_A_STREAMING_BACKUP(x) (x == tape || x == udev || x == cdstream)
     153
     154/**
     155 * The stub name of the temporary ISO image to create, burn, and remove.
     156 */
     157#define MONDO_TMPISOS "temporary.iso"
    153158
    154159/**
  • branches/stable/mondo/src/mondorestore/mondo-rstr-compare.c

    r1663 r1670  
    2121/* Reference to global bkpinfo */
    2222extern struct s_bkpinfo *bkpinfo;
     23
     24extern char *g_mountlist_fname;
    2325
    2426//static char cvsid[] = "$Id$";
     
    506508{
    507509    int retval = 0;
     510    int res = 0;
    508511    long q = 0L;
    509512    char *tmp = NULL;
     
    533536
    534537    read_cfg_file_into_bkpinfo(g_mondo_cfg_file);
     538
     539    /* edit_mountlist if wanted */
     540    iamhere("About to edit mountlist");
     541    if (g_text_mode) {
     542        save_mountlist_to_disk(mountlist, g_mountlist_fname);
     543        mr_asprintf(&tmp, "%s %s", find_my_editor(), g_mountlist_fname);
     544        res = system(tmp);
     545        mr_free(tmp);
     546        load_mountlist(mountlist, g_mountlist_fname);
     547    } else {
     548        res = edit_mountlist(g_mountlist_fname, mountlist, raidlist);
     549    }
     550    iamhere("Finished editing mountlist");
     551    if (res) {
     552        paranoid_MR_finish(1);
     553    }
     554    save_mountlist_to_disk(mountlist, g_mountlist_fname);
     555    save_raidlist_to_raidtab(raidlist, RAIDTAB_FNAME);
     556
    535557    g_current_media_number = 1;
    536558    mvaddstr_and_log_it(1, 30, _("Comparing Automatically"));
Note: See TracChangeset for help on using the changeset viewer.