Ignore:
Timestamp:
Sep 25, 2007, 12:54:32 AM (13 years ago)
Author:
Bruno Cornec
Message:

Fix a bug where df was using locale to print messages and wasn't filtered correctly
Improve setup of tmpdir again

File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/2.2.5/mondo/src/common/libmondo-devices.c

    r1646 r1655  
    25162516    strcpy(tmp,
    25172517           call_program_and_get_last_line_of_output
    2518            ("df -m -P -t nonfs,msdosfs,ntfs,smbfs,smb,cifs,afs,ocfs,ocfs2,mvfs | tr -s '\t' ' ' | grep -vE \"none|Filesystem\" | awk '{printf \"%s %s\\n\", $4, $6;}' | sort -n | tail -n1 | awk '{print $NF;}'"));
     2518           ("LANGUAGE=C df -m -P -t nonfs,msdosfs,ntfs,smbfs,smb,cifs,afs,ocfs,ocfs2,mvfs | tr -s '\t' ' ' | grep -vE \"none|Filesystem\" | awk '{printf \"%s %s\\n\", $4, $6;}' | sort -n | tail -n1 | awk '{print $NF;}'"));
    25192519#else
    25202520    strcpy(tmp,
    25212521           call_program_and_get_last_line_of_output
    2522            ("df -m -P -x nfs -x vfat -x ntfs -x smbfs -x smb -x cifs -x afs -x ocfs -x ocfs2 -x mvfs | sed 's/                  /devdev/' | tr -s '\t' ' ' | grep -vE \"none|Filesystem|/dev/shm\" | awk '{printf \"%s %s\\n\", $4, $6;}' | sort -n | tail -n1 | awk '{print $NF;}'"));
     2522           ("LANGUAGE=C df -m -P -x nfs -x vfat -x ntfs -x smbfs -x smb -x cifs -x afs -x ocfs -x ocfs2 -x mvfs | sed 's/                  /devdev/' | tr -s '\t' ' ' | grep -vE \"none|Filesystem|/dev/shm\" | awk '{printf \"%s %s\\n\", $4, $6;}' | sort -n | tail -n1 | awk '{print $NF;}'"));
    25232523#endif
    25242524
     
    25312531        fatal_error("I couldn't figure out the tempdir!");
    25322532    }
    2533     sprintf(bkpinfo->tmpdir, "%s/tmp.mondo.%d", tmp,
    2534             (int) (random() % 32768));
     2533    setup_tmpdir(tmp);
    25352534    log_it("bkpinfo->tmpdir is being set to %s", bkpinfo->tmpdir);
    25362535
Note: See TracChangeset for help on using the changeset viewer.