Ignore:
Timestamp:
Jan 3, 2006, 4:15:54 PM (14 years ago)
Author:
bcornec
Message:

merge -r272:273 $SVN_M/branches/2.06

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/mondo/mondo/mondo-makefilelist

    r30 r274  
    9999    done
    100100# exclude lost+found folders, Win9x hibernation file and Win9x swap file
    101     cat $TMP/filelist | sort | uniq | \
     101    sort $TMP/filelist -u | \
    102102grep -v "/win386\.swp" | grep -v "/vmmhiber\.w9x" | \
    103103grep -v "/hiberfil\.sys" | grep -v "/win386.swp" | grep -v "/pagefile\.sys" | \
     
    108108# End patch
    109109#     for i in `cat /etc/fstab | tr -s '\t' ' ' | cut -d' ' -f2` ; do
    110         cat $output | grep -vx "$i/lost+found" | grep -vx $i"lost+found" > $output.MID
     110        grep -vx "$i/lost+found" $output | grep -vx $i"lost+found" > $output.MID
    111111        sync
    112112        mv -f $output.MID $output
     
    114114# exclude .journal files (ext3)
    115115    for i in `cat /etc/fstab | tr -s '\t' ' ' | grep "ext3" | cut -d' ' -f2` ; do
    116     cat $output | grep -vx "$i/\.journal" | grep -vx "$i\.journal" | grep -vx "$i\.autofsck" > $output.MID
     116    grep -vx "$i/\.journal" $output | grep -vx "$i\.journal" | grep -vx "$i\.autofsck" > $output.MID
    117117        sync
    118118    mv -f $output.MID $output
    119119    done
    120120# exclude /var/log/pacct and Mondo's temp files
    121     cat $output | grep -vx "" | grep -v "/var/log/pacct" | grep -v "tmp\.mondo\.$$" | grep -vx "/var/log/mondo-archive\.log" | grep -v "mondo\.scratch\.$$" > $output.MID
     121    grep -vx "" $output | grep -v "/var/log/pacct" | grep -v "tmp\.mondo\.$$" | grep -vx "/var/log/mondo-archive\.log" | grep -v "mondo\.scratch\.$$" > $output.MID
    122122    mv -f $output.MID $output
    123123    cp -f $output $TMP/filelist
    124124# exclude /var/run/*.pid (lockfiles)
    125 #    cat $output | grep -vx "/var/run/[^\.]*\.pid" > $output.MID
     125#    grep -vx "/var/run/[^\.]*\.pid" $output > $output.MID
    126126#    mv -f $output.MID $output
    127127}
     
    180180for X in $EXCLUDE_PATHS  ; do
    181181    if [ ! -d $X ] ; then
    182     cat $TMP/filelist.blah | grep -v $X > $TMP/filelist.full
     182    grep -v $X $TMP/filelist.blah > $TMP/filelist.full
    183183    mv -f $TMP/filelist.full $TMP/filelist.blah
    184184    fi
    185185done
    186 cat $TMP/filelist.blah | grep -v "mojo-jojo-123" > $TMP/filelist.full
     186grep -v "mojo-jojo-123" $TMP/filelist.blah > $TMP/filelist.full
    187187[ ! -e "$TMP/filelist.full" ] && FatalError "Serious error when removing mojo jojo from fielist"
    188188cp $TMP/filelist.full /tmp
Note: See TracChangeset for help on using the changeset viewer.