Changeset 2349


Ignore:
Timestamp:
Aug 27, 2009, 2:40:29 PM (10 years ago)
Author:
bruno
Message:
  • Solve tmp dir creation which sometimes was trying to create /%xx dirs. Should fix #293 for good
  • Adds fdisk -l result in Log File at restore time

(Backports from 2.2.9)

Location:
branches/2.2.10
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/2.2.10/mindi/rootfs/sbin/init

    r2329 r2349  
    785785LogIt "init (from mindi v$MINDI_VER-r${MINDI_REV})"
    786786LogIt "$CMDLINE is:"
     787LogIt "----------"
    787788cat $CMDLINE  >> $LOGFILE
     789LogIt "----------"
    788790LogIt "df result:"
    789791LogIt "----------"
     
    813815LogIt "-------------"
    814816cat /proc/partitions  >> $LOGFILE
    815 
     817LogIt "-------------"
     818LogIt "fdisk result:" >> $LOGFILE
     819LogIt "-------------"
     820fdisk -l  >> $LOGFILE
    816821
    817822ide-opt
  • branches/2.2.10/mondo/src/common/libmondo-devices.c

    r2334 r2349  
    20932093
    20942094#ifdef __FreeBSD__
    2095     mr_asprintf(tmp, "%s", call_program_and_get_last_line_of_output("LANGUAGE=C df -m -P -t nonfs,msdosfs,ntfs,ntfs-3g,smbfs,smb,cifs,afs,gfs,ocfs,ocfs2,mvfs,nsspool,nssvol | tr -s '\t' ' ' | grep -vE \"none|Filesystem\" | awk '{printf \"%s %s\\n\", $4, $6;}' | sort -n | tail -n1 | awk '{print $NF;}'"));
     2095    mr_asprintf(tmp, "%s", call_program_and_get_last_line_of_output("LANGUAGE=C df -m -P -t nonfs,msdosfs,ntfs,ntfs-3g,smbfs,smb,cifs,afs,gfs,ocfs,ocfs2,mvfs,nsspool,nssvol | grep -vE \"none|Filesystem\" | awk '{printf \"%s %s\\n\", $4, $6;}' | sort -n | tail -n1 | awk '{print $NF;}'"));
    20962096#else
    2097     mr_asprintf(tmp, "%s", call_program_and_get_last_line_of_output("LANGUAGE=C df -m -P -x nfs -x nfs4 -x vfat -x ntfs -x ntfs-3g -x smbfs -x smb -x cifs -x afs -x gfs -x ocfs -x ocfs2 -x mvfs -x nsspool -x nssvol -x iso9660| 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;}'"));
     2097    mr_asprintf(tmp, "%s", call_program_and_get_last_line_of_output("LANGUAGE=C df -m -P -x nfs -x nfs4 -x vfat -x ntfs -x ntfs-3g -x smbfs -x smb -x cifs -x afs -x gfs -x ocfs -x ocfs2 -x mvfs -x nsspool -x nssvol -x iso9660 | grep -vE \"none|Filesystem|/dev/shm\" | awk '{printf \"%s %s\\n\", $4, $6;}' | sort -n | tail -n1 | awk '{print $NF;}'"));
    20982098#endif
    20992099
Note: See TracChangeset for help on using the changeset viewer.