Ignore:
Timestamp:
Jul 30, 2006, 4:06:39 PM (14 years ago)
Author:
Bruno Cornec
Message:

merge -r686:728 $SVN_M/branches/stable

Location:
trunk/mondo/mondo/restore-scripts/mondo
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/mondo/mondo/restore-scripts/mondo/grub-install.patched

    r588 r729  
    257257    # For now, this uses the program `df' to get the device name, but is
    258258    # this really portable?
    259     tmp_fname=`df -P $1/ | sed -n 's%.*\(/dev/[^    ]*\).*%\1%p'`
     259    tmp_fname=`df $1/ | sed -n 's%.*\(/dev/[^   ]*\).*%\1%p'`
    260260
    261261    if test -z "$tmp_fname"; then
  • trunk/mondo/mondo/restore-scripts/mondo/label-partitions-as-necessary

    r588 r729  
    5959while [ "$line" != "" ] && [ "$noof_blank_lines" -le "5" ] ; do
    6060    if [ "$line" = "" ] ; then
    61     noof_blank_lines=$(($noof_blank_lines+1))
     61        noof_blank_lines=$(($noof_blank_lines+1))
    6262    else
    63     noof_blank_lines=0
    64     read_partition_line "$line"
     63        noof_blank_lines=0
     64        read_partition_line "$line"
    6565    fi
    6666    read line
Note: See TracChangeset for help on using the changeset viewer.