Changeset 1438


Ignore:
Timestamp:
May 12, 2007, 1:55:13 AM (12 years ago)
Author:
bruno
Message:

Merge Andree's patch (2.2.4 rev [1437] around MINDI_CACHE define)
Announce for LinuxDay? added

Location:
branches/stable
Files:
6 edited

Legend:

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

    r1408 r1438  
    933933    if (!res) {
    934934        log_to_screen("Boot+data disks were created OK");
    935         mr_asprintf(&command, "mkdir -p /var/cache/mindi/");
     935        mr_asprintf(&command, "mkdir -p "MINDI_CACHE);
    936936        mr_msg(2, command);
    937937        run_program_and_log_output(command, FALSE);
     
    939939
    940940        mr_asprintf(&command,
    941                 "cp -f %s/images/mindi.iso /var/cache/mindi/mondorescue.iso",
    942                 bkpinfo->scratchdir);
     941                "cp -f %s/images/mindi.iso %s/mondorescue.iso",
     942                bkpinfo->scratchdir, MINDI_CACHE);
    943943        mr_msg(2, command);
    944944        run_program_and_log_output(command, FALSE);
     
    27612761    if (!bkpinfo->nonbootable_backup) {
    27622762#ifdef __FreeBSD__
    2763         if (!does_file_exist("/var/cache/mindi/mindi-kern.1722.img"))
     2763        if (!does_file_exist(MINDI_CACHE"/mindi-kern.1722.img"))
    27642764#else
    27652765        /* BERLIOS: To be improved */
    2766         if (!does_file_exist("/var/cache/mindi/mindi-bootroot.1722.img")
    2767             && !does_file_exist("/var/cache/mindi/mindi-boot.1440.img")
    2768             && !does_file_exist("/var/cache/mindi/mindi-boot.2880.img")
    2769             && !does_file_exist("/var/cache/mindi/mindi-boot.5760.img")
    2770             && !does_file_exist("/var/cache/mindi/mindi-boot.8192.img"))
     2766        if (!does_file_exist(MINDI_CACHE"/mindi-bootroot.1722.img")
     2767            && !does_file_exist(MINDI_CACHE"/mindi-boot.1440.img")
     2768            && !does_file_exist(MINDI_CACHE"/mindi-boot.2880.img")
     2769            && !does_file_exist(MINDI_CACHE"/mindi-boot.5760.img")
     2770            && !does_file_exist(MINDI_CACHE"/mindi-boot.8192.img"))
    27712771#endif
    27722772        {
    27732773            mvaddstr_and_log_it(g_currentY++, 74, "No Imgs");
    2774             if (does_file_exist("/var/cache/mindi/mondorescue.iso")) {
     2774            if (does_file_exist(MINDI_CACHE"/mondorescue.iso")) {
    27752775                popup_and_OK
    2776                     ("Boot+data floppy creation failed. However, FYI, you may burn /var/cache/mindi/mondorescue.iso to a CD and boot from that instead if you wish.");
     2776                    ("Boot+data floppy creation failed. However, FYI, you may burn "MINDI_CACHE"/mondorescue.iso to a CD and boot from that instead if you wish.");
    27772777                res++;
    27782778            }
    27792779        } else {
    2780             offer_to_write_floppies(bkpinfo, "/var/cache/mindi");
     2780            offer_to_write_floppies(bkpinfo, MINDI_CACHE);
    27812781            mvaddstr_and_log_it(g_currentY++, 74, "Done.");
    27822782        }
  • branches/stable/mondo/src/common/libmondo-filelist.c

    r1348 r1438  
    15821582        sprintf(exclude_paths, " %s %s %s %s %s %s . .. \
    15831583" MNT_CDROM " " MNT_FLOPPY " /media \
    1584 /proc /sys /tmp /var/log/lastlog /root/images/mondo /var/cache/mindi ", 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);
     1584/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);
    15851585
    15861586        mr_msg(2, "Excluding paths = '%s'", exclude_paths);
  • branches/stable/mondo/src/common/libmondo-tools.c

    r1425 r1438  
    851851#endif
    852852
    853     Lres = free_space_on_given_partition("/var/cache");
     853    Lres = free_space_on_given_partition(MONDO_CACHE);
    854854    log_it("Free space on given partition = %ld MB", Lres);
    855855
    856856    if (Lres < 50) {
    857         fatal_error("Your /var/cache partition has <50MB free. Please adjust your partition table to something saner.");
     857        fatal_error("Your "MONDO_CACHE" partition has <50MB free. Please adjust your partition table to something saner or make "MONDO_CACHE" a symbolic link");
    858858    }
    859859
  • branches/stable/mondo/src/include/my-stuff.h

    r1362 r1438  
    1616/* Hardcoded: Bad for the moment */
    1717#define MONDO_CACHE "/var/cache/mondo"
     18#define MINDI_CACHE "/var/cache/mindi"
    1819#define MONDORESTORECFG MONDO_CACHE"/mondo-restore.cfg"
    1920/**
  • branches/stable/mondo/src/mondoarchive/mondoarchive.c

    r1434 r1438  
    531531    }
    532532
    533     if (does_file_exist("/var/cache/mindi/mondorescue.iso")) {
     533    if (does_file_exist(MINDI_CACHE"/mondorescue.iso")) {
    534534        log_to_screen
    535             (_("/var/cache/mindi/mondorescue.iso, a boot/utility CD, is available if you want it."));
     535            (_(MINDI_CACHE"/mondorescue.iso, a boot/utility CD, is available if you want it."));
    536536    }
    537537
Note: See TracChangeset for help on using the changeset viewer.