Changeset 2349 in MondoRescue

Timestamp:

Aug 27, 2009, 2:40:29 PM (15 years ago)

Author:

Bruno Cornec

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:

• mindi/rootfs/sbin/init (modified) (2 diffs)
• mondo/src/common/libmondo-devices.c (modified) (1 diff)

branches/2.2.10/mindi/rootfs/sbin/init

@@ -785 +785 @@
 LogIt "init (from mindi v$MINDI_VER-r${MINDI_REV})"
 LogIt "$CMDLINE is:"
+LogIt "----------"
 cat $CMDLINE  >> $LOGFILE
+LogIt "----------"
 LogIt "df result:"
 LogIt "----------"
@@ -813 +815 @@
 LogIt "-------------"
 cat /proc/partitions  >> $LOGFILE
-
+LogIt "-------------"
+LogIt "fdisk result:" >> $LOGFILE
+LogIt "-------------"
+fdisk -l  >> $LOGFILE
 
 ide-opt

branches/2.2.10/mondo/src/common/libmondo-devices.c

@@ -2093 +2093 @@
 
 #ifdef __FreeBSD__
-    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;}'"));
+    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;}'"));
 #else
-    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;}'"));
+    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;}'"));
 #endif