Changeset 140 for trunk


Ignore:
Timestamp:
Nov 25, 2005, 11:50:08 PM (13 years ago)
Author:
bcornec
Message:

merge -r136:139 $SVN_M/branches/2.05

Location:
trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/mindi/mindi

    r137 r140  
    14371437        for qq in "" `find /dev/ida/c*d* ! -name '*p*'` ; do
    14381438        partition_format=`$FDISK -l $qq 2>> $LOGFILE | grep -w "$c_p" | sed 's/12/|/' | tr -s '\t' ' ' | cut -d'|' -f2 | cut -d' ' -f2-9`
    1439                 echo "------- $FDISK -l log ------------" >> $LOGFILE
     1439                echo "------- $FDISK -l $qq log ------------" >> $LOGFILE
    14401440                cat $FDISKLOG >> $LOGFILE
    14411441                echo "------- $FDISK log end ------------" >> $LOGFILE
     
    24502450# patch from Bill <bill@iwizard.biz> - 2003/08/25
    24512451    res=`$FDISK -s $device`
    2452     echo "------- $FDISK -l log ------------" >> $LOGFILE
     2452    echo "------- $FDISK -l $device log ------------" >> $LOGFILE
    24532453    cat $FDISKLOG >> $LOGFILE
    24542454    echo "------- $FDISK log end ------------" >> $LOGFILE
  • trunk/mondo/mondo/restore-scripts/mondo/grub-MR

    r30 r140  
    55#
    66#
     7#
     8# 2005/11/25
     9# - try_grub_hack : do not return success when grub wrote 'Error '
    710#
    811# 2004/06/28
     
    118121    quit \n" > /tmp/feed.txt
    119122    cat /tmp/feed.txt
     123    log_file=/tmp/grub.output
    120124    if [ "$MNT_RESTORING" ] ; then
    121         chroot /mnt/RESTORING grub --batch < /tmp/feed.txt
     125        chroot /mnt/RESTORING grub --batch < /tmp/feed.txt > $log_file
    122126    else
    123         grub --batch < /tmp/feed.txt
     127        grub --batch < /tmp/feed.txt > $log_file
    124128    fi
    125     return $?
     129    cat $log_file
     130    if grep "Error [0-9]*: " $log_file >/dev/null; then
     131            return 1
     132    else
     133            return 0
     134    fi
    126135}
    127136
Note: See TracChangeset for help on using the changeset viewer.