Changeset 1489


Ignore:
Timestamp:
Jun 6, 2007, 1:46:19 AM (12 years ago)
Author:
bruno
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)

Location:
branches/stable
Files:
7 edited

Legend:

Unmodified
Added
Removed
  • branches/stable/mindi/analyze-my-lvm

    r1063 r1489  
    5353GenerateLvcreateParameters() {
    5454    local device stripes stripesize device fname allocation output readahead
    55     fname=/tmp/PLF.$$.txt
     55    fname=$MINDI_TMP/PLF.$$.txt
    5656    device=$1
    5757    output=""
     
    8181    local current_VG device fname incoming VG_info_file max_logical_volumes max_physical_volumes physical_extent_size output blanklines
    8282    current_VG=$1
    83     VG_info_file=/tmp/$$.vg-info.txt
     83    VG_info_file=$MINDI_TMP/$$.vg-info.txt
    8484    $LVMCMD vgdisplay $current_VG > $VG_info_file
    8585    max_logical_volumes=`GetValueFromField "$VG_info_file" "MAX LV"`
  • branches/stable/mindi/mindi

    r1468 r1489  
    114114BOOT_MEDIA_MESSAGE="$mindi_boot_msg"
    115115FDISK=$MINDI_SBIN/parted2fdisk
    116 MINDI_TMP=`mktemp -d $TMPDIR/mindi.XXXXXXXXXX`
     116
     117# Now we can create what we need
     118export MINDI_TMP=`mktemp -d $TMPDIR/mindi.XXXXXXXXXX`
    117119
    118120# ----------------------------------------------------------------------------
     
    473475        echo -en "."
    474476        reason=""
    475         vanilla_lib_name=`echo "$optimized_lib_name" | sed -e 's/i[5-7]86//' -e 's/cmov//' | tr -s '/' '/'`
     477        vanilla_lib_name=`echo "$optimized_lib_name" | sed -e 's/i[5-7]86//' -e 's/cmov//' -e 's/nosegneg//' | tr -s '/' '/'`
    476478        echo "$vanilla_lib_name" >> $filelist
    477479        resolved=$vanilla_lib_name
     
    868870
    869871    # scan kernel image for initrd filessystem support
    870     lvScanRes=`dd ibs=1 skip=$lvOffset if=$lvKernelImage obs=1M 2>/dev/null | gunzip -c | strings | grep -e "$lcMagicCramfs" -e "$lcMagicExt2fs" -e "$lcMagicInitfs"`
     872    lvScanRes=`dd ibs=1 skip=$lvOffset if=$lvKernelImage obs=1M 2>/dev/null | gunzip -c 2> /dev/null | strings | grep -e "$lcMagicCramfs" -e "$lcMagicExt2fs" -e "$lcMagicInitfs"`
    871873
    872874    # determine which filesystem to use for initrd image: ext2fs, gzip'ed cpio (initramfs ) or cramfs
     
    31263128        mv $MINDI_TMP/* $MINDI_TMP/.??* $MONDO_TMP 2> /dev/null
    31273129        rmdir $MINDI_TMP
    3128         MINDI_TMP=$MONDO_TMP
     3130        export MINDI_TMP=$MONDO_TMP
    31293131        mkdir -p $MINDI_TMP
    31303132        # This is the scratch dir in mondo
  • branches/stable/mondo-doc/mindi.8

    r1063 r1489  
    180180which overwrites default values described in
    181181.B mindi.conf.dist
    182 in the same directory.
     182in the same directory. (Cf comments in this file)
    183183.br
    184184.SH "SEE ALSO"
  • branches/stable/mondo-doc/mondoarchive.8

    r1338 r1489  
    173173.BI "-N"
    174174Exclude all mounted network filesystems. This currently means NFS, SMB, Coda, MVFS, AFS
    175 and Netware. In other words, only backup the local hard disk(s).
     175OCFS and Netware. In other words, only backup the local hard disk(s).
    176176
    177177.TP
  • branches/stable/mondo/src/common/libmondo-devices.c

    r1452 r1489  
    20102010    strcpy(exclude_these_directories,
    20112011           call_program_and_get_last_line_of_output
    2012            ("mount -t coda,ncpfs,nfs,smbfs,cifs,afs,mvfs | tr -s '\t' ' ' | cut -d' ' -f3 | tr -s '\n' ' ' | awk '{print $0;}'"));
     2012           ("mount -t coda,ncpfs,nfs,smbfs,cifs,afs,ocfs,ocfs2,mvfs | tr -s '\t' ' ' | cut -d' ' -f3 | tr -s '\n' ' ' | awk '{print $0;}'"));
    20132013    strcpy(exclude_these_devices,
    20142014           call_program_and_get_last_line_of_output
    2015            ("tr -s '\t' ' ' < /etc/fstab | grep -E '( (coda|ncpfs|nfs|smbfs|cifs|mvfs) )' | cut -d' ' -f1 | tr -s '\n' ' ' | awk '{print $0;}'"));
     2015           ("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;}'"));
    20162016    sprintf(result_sz, "%s", exclude_these_directories);
    20172017    mr_free(exclude_these_devices);
     
    20412041    mr_asprintf(&tmp,
    20422042           call_program_and_get_last_line_of_output
    2043            ("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;}'"));
     2043           ("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;}'"));
    20442044#else
    20452045    mr_asprintf(&tmp,
    20462046           call_program_and_get_last_line_of_output
    2047            ("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;}'"));
     2047           ("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;}'"));
    20482048#endif
    20492049
  • branches/stable/tools/DISTROS

    r1474 r1489  
    99fedora_5
    1010fedora_6
     11rhel_2.1
    1112rhel_3
    1213rhel_4
     
    1920debian_3.1
    2021debian_4.0
     22ubuntu_6.04
    2123ubuntu_7.04
    2224gentoo_1.6
  • branches/stable/tools/qemu-vm.txt

    r1481 r1489  
    8585rpm -ivh ~bruno/build/RPMS/i?86/afio-[0-9]* ~bruno/build/RPMS/i?86/buffer-[0-9]*
    8686
     87# Adapt sudoers
     88
     89# For RHAS 2.1 add grep-2.5.1
     90
    8791#for gentoo
    8892chown bruno /etc/make.conf
Note: See TracChangeset for help on using the changeset viewer.