Changeset 1489 in MondoRescue for branches/stable/mondo/src/common/libmondo-devices.c

Timestamp:

Jun 6, 2007, 1:46:19 AM (17 years ago)

Author:

Bruno Cornec

Message:

• Avoid to backup ocfs/ocfs2 filesystems (+ afs forgotten in some places)
• Use MINDI_TMP in analyze-my-lvm (good practice and may solve an issue with selinux)
• export MINDI_TMP so that it may be used by subscripts
• Suppress error messages from gunzip when testing for kernel content
• mindi.conf isn't officially supported in that version so man page adapted
• Fix a bug where MINDI_CACHE wasn't excluded from backup
• Add support for Ubuntu 6.04 Dapper LTS
• Fix a bug for CentOS/RHEL 5 where optimized libraries are located /lib/i686/nosegneg (Brandon Poyner <bpoyner_at_ccac.edu>)
• Add support for RHAS 2.1 (rhel_2.1)

(merge -r1480:1488 $SVN_M/branches/2.2.4)

File:

• branches/stable/mondo/src/common/libmondo-devices.c (modified) (2 diffs)

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

@@ -2010 +2010 @@
     strcpy(exclude_these_directories,
            call_program_and_get_last_line_of_output
-           ("mount -t coda,ncpfs,nfs,smbfs,cifs,afs,mvfs | tr -s '\t' ' ' | cut -d' ' -f3 | tr -s '\n' ' ' | awk '{print $0;}'"));
+           ("mount -t coda,ncpfs,nfs,smbfs,cifs,afs,ocfs,ocfs2,mvfs | tr -s '\t' ' ' | cut -d' ' -f3 | tr -s '\n' ' ' | awk '{print $0;}'"));
     strcpy(exclude_these_devices,
            call_program_and_get_last_line_of_output
-           ("tr -s '\t' ' ' < /etc/fstab | grep -E '( (coda|ncpfs|nfs|smbfs|cifs|mvfs) )' | cut -d' ' -f1 | tr -s '\n' ' ' | awk '{print $0;}'"));
+           ("tr -s '\t' ' ' < /etc/fstab | grep -E '( (coda|ncpfs|nfs|smbfs|cifs|afs|ocfs|ocfs2|mvfs) )' | cut -d' ' -f1 | tr -s '\n' ' ' | awk '{print $0;}'"));
     sprintf(result_sz, "%s", exclude_these_directories);
     mr_free(exclude_these_devices);
@@ -2041 +2041 @@
     mr_asprintf(&tmp,
            call_program_and_get_last_line_of_output
-           ("df -m -P -t nonfs,msdosfs,ntfs,smbfs,smb,cifs,afs,mvfs | tr -s '\t' ' ' | grep -vE \"none|Filesystem\" | awk '{printf \"%s %s\\n\", $4, $6;}' | sort -n | tail -n1 | awk '{print $NF;}'"));
+           ("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;}'"));
 #else
     mr_asprintf(&tmp,
            call_program_and_get_last_line_of_output
-           ("df -m -P -x nfs -x vfat -x ntfs -x smbfs -x smb -x cifs -x afs -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;}'"));
+           ("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;}'"));
 #endif