Ignore:
Timestamp:
Oct 3, 2008, 1:50:44 AM (11 years ago)
Author:
Bruno Cornec
Message:
  • Fix #252
  • Improve OCFS2 support (ocfs2 is a SANE_FORMAT)
File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/2.2.7/mondo/src/common/libmondo-tools.c

    r1999 r2030  
    1 /* libmondo-tools.c                                  misc tools
     1/*
    22   $Id$
    33*/
     
    6464/**
    6565 * The location where tmpfs is mounted, or "" if it's not mounted.
    66  */
    6766char *g_tmpfs_mountpt = NULL;
     67 */
    6868char *g_magicdev_command = NULL;
    6969
     
    426426    char *hostname, *ip_address;
    427427    int retval = 0;
    428     long avm = 0;
    429428    char *colon;
    430429    char *cdr_exe;
    431430    char *tmp;
    432431    char call_before_iso_user[MAX_STR_LEN] = "\0";
     432    /*
     433    long avm = 0;
    433434    int rdsiz_MB;
     435    */
    434436    char *iso_dev;
    435437    char *iso_mnt;
     
    471473    run_program_and_log_output("cat /etc/*-release", 5);
    472474    run_program_and_log_output("cat /etc/*issue*", 5);
     475    /*
    473476    sprintf(g_tmpfs_mountpt, "%s/tmpfs", bkpinfo->tmpdir);
    474477    sprintf(command, "mkdir -p %s", g_tmpfs_mountpt);
    475478    paranoid_system(command);
    476479    rdsiz_MB = PPCFG_RAMDISK_SIZE + g_tape_buffer_size_MB;
     480    */
    477481#ifdef __FreeBSD__
     482    /*
    478483    strcpy(tmp,
    479484           call_program_and_get_last_line_of_output
     
    486491    sprintf(command, "mdmfs -s %d%c md9 %s", rdsiz_MB, 'm',
    487492            g_tmpfs_mountpt);
     493            */
    488494#else
     495    /*
    489496    strcpy(tmp,
    490497           call_program_and_get_last_line_of_output
     
    493500    sprintf(command, "mount /dev/shm -t tmpfs %s -o size=%d%c",
    494501            g_tmpfs_mountpt, rdsiz_MB, 'm');
     502            */
    495503    run_program_and_log_output("cat /proc/cpuinfo", 5);
    496504    run_program_and_log_output
     
    498506         5);
    499507#endif
     508    /*
    500509    if (avm / 1024 > rdsiz_MB * 3) {
    501510        if (run_program_and_log_output(command, 5)) {
     
    509518        log_it("It doesn't seem you have enough swap to use tmpfs. Fine.");
    510519    }
     520    */
    511521
    512522    if (bkpinfo->use_lzo) {
     
    14291439        malloc_string(g_boot_mountpt);
    14301440        malloc_string(g_mondo_home);
     1441        /*
    14311442        malloc_string(g_tmpfs_mountpt);
     1443        */
    14321444        malloc_string(g_serial_string);
    14331445        malloc_string(g_magicdev_command);
     
    14351447        paranoid_free(g_boot_mountpt);
    14361448        paranoid_free(g_mondo_home);
     1449        /*
    14371450        paranoid_free(g_tmpfs_mountpt);
     1451        */
    14381452        paranoid_free(g_serial_string);
    14391453        paranoid_free(g_magicdev_command);
Note: See TracChangeset for help on using the changeset viewer.