Changeset 2833 in MondoRescue for branches/2.2.8/mondo/src/restore-scripts


Ignore:
Timestamp:
Jun 19, 2011, 2:13:48 AM (13 years ago)
Author:
Bruno Cornec
Message:
  • Revert bad changes made accidentaly on the 2.2.8 branch
Location:
branches/2.2.8/mondo/src/restore-scripts/mondo
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • branches/2.2.8/mondo/src/restore-scripts/mondo/Makefile.am

    r2788 r2833  
    44                        make-me-bootable mount-me mount-subroutine-me raw-MR \
    55                        stabgrub-me stablilo-me stabelilo-me \
    6                         stabraw-me unmount-me unmount-subroutine-me \
     6                        stabraw-me unmount-me unmount-subroutine-me
    77                        format-and-kludge-vfat
  • branches/2.2.8/mondo/src/restore-scripts/mondo/format-and-kludge-vfat

    r2815 r2833  
    6363
    6464device=$1
    65 echo $device | grep -Eq "/cciss/|/mapper/|/ida/"
    66 if [ $? -eq "0" ]; then
    67     drive=`echo $device | sed s/[0-9p]*[0-9]//`
    68 else
    69     drive=`echo $drive | sed s/[0-9]*[0-9]//`
    70 fi
     65drive=`echo $device | sed s/[0-9]*[0-9]//`
    7166partition=`echo $device | sed s\%$drive\%\%`
    7267
  • branches/2.2.8/mondo/src/restore-scripts/mondo/grub-MR

    r2814 r2833  
    115115    partno=`basename $bootpart | cut -d'p' -f2`
    116116elif echo $bootpart | grep "/mapper/mpath" > /dev/null ; then
    117     partno=`basename $bootpart | cut -d'p' -f3`
     117    partno=`basename $bootpart | cut -d'p' -f2`
    118118else
    119119    partno=`basename $bootpart | sed s/[a-z]*//`
     
    128128    line=`grep $base /proc/mdstat | head -n1`
    129129    echo "mbrpart was $mbrpart"
    130     mbrpart=`parted2fdisk -l | grep /dev/ | head -n1 | tr ':' ' ' | cut -d' ' -f2`
     130    mbrpart=`parted2fdisk -l | grep /dev/ | head -n1 | tr ':' ' ' \
     131| cut -d' ' -f2`
    131132    echo "mbrpart is $mbrpart"
    132133    partno="0"; # cheating - FIXME   
  • branches/2.2.8/mondo/src/restore-scripts/mondo/label-partitions-as-necessary

    r2801 r2833  
    6161noof_blank_lines=0
    6262read line
    63 # We end after 50 empty lines, which hopefully means we reach the end of the file
    64 while [ "$noof_blank_lines" -le "50" ] ; do
     63while [ "$line" != "" ] && [ "$noof_blank_lines" -le "5" ] ; do
    6564    if [ "$line" = "" ] ; then
    6665        noof_blank_lines=$(($noof_blank_lines+1))
Note: See TracChangeset for help on using the changeset viewer.