Ignore:
Timestamp:
Apr 10, 2008, 1:13:58 AM (11 years ago)
Author:
bruno
Message:

merge -r 1842:1889 2.2.5

File:
1 edited

Legend:

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

    r1817 r1903  
    15271527    time_t time_of_last_full_backup = 0;
    15281528    struct stat statbuf;
     1529    char *tmp1 = NULL;
     1530    char *tmp2 = NULL;
    15291531
    15301532    malloc_string(sz_datefile);
     
    15861588        mr_msg(2, "include_paths = '%s'", include_paths);
    15871589        mr_msg(1, "Calculating filelist");
    1588         mr_asprintf(&exclude_paths, " %s %s %s %s %s %s %s . .. \
    1589 " MNT_CDROM " /mnt/floppy /media \
    1590 /proc /sys /tmp /var/log/lastlog /root/images/mondo " MINDI_CACHE " " MONDO_CACHE, excp, call_program_and_get_last_line_of_output("locate /win386.swp 2> /dev/null"), call_program_and_get_last_line_of_output("locate /hiberfil.sys 2> /dev/null"), call_program_and_get_last_line_of_output("locate /pagefile.sys 2> /dev/null"), (tmpdir[0] == '/' && tmpdir[1] == '/') ? (tmpdir + 1) : tmpdir, (scratchdir[0] == '/' && scratchdir[1] == '/') ? (scratchdir + 1) : scratchdir);
     1590        mr_asprintf(&tmp2, call_program_and_get_last_line_of_output("mount | grep -Ew 'ntfs|fat|vfat|dos' | awk '{print $3}'"));
     1591        if (strlen(tmp2) < 1) {
     1592            mr_asprintf(&tmp1,"");
     1593        } else {
     1594            mr_msg(2, "Found windows FS: %s",tmp2);
     1595            mr_asprintf(&tmp1, "find %s -name '/win386.swp' -o -name '/hiberfil.sys' -o -name '/pagefile.sys' 2> /dev/null\n",tmp2);
     1596            mr_free(tmp2);
     1597            mr_asprintf(&tmp2, call_program_and_get_last_line_of_output(tmp1));
     1598            mr_msg(2, "Found windows files: %s",tmp2);
     1599        }
     1600        mr_free(tmp1);
    15911601
    15921602        mr_msg(2, "Excluding paths = '%s'", exclude_paths);
     1603        mr_asprintf(&exclude_paths, " %s %s %s %s %s %s . .. \
     1604" MNT_CDROM " " MNT_FLOPPY " /media /tmp /var/log/lastlog \
     1605/proc /sys /root/images/mondo ", MINDI_CACHE, MONDO_CACHE, excp, tmp2, (tmpdir[0] == '/' && tmpdir[1] == '/') ? (tmpdir + 1) : tmpdir, (scratchdir[0] == '/' && scratchdir[1] == '/') ? (scratchdir + 1) : scratchdir);
     1606        paranoid_free(tmp2);
     1607
    15931608        mr_msg(2,
    15941609                "Generating skeleton filelist so that we can track our progress");
Note: See TracChangeset for help on using the changeset viewer.