Changeset 691


Ignore:
Timestamp:
Jul 21, 2006, 3:49:26 AM (13 years ago)
Author:
bcornec
Message:

Busybox's df doesn't support -P.
Looking for a bug where e2label not called in nuke mode but not found yet, except if it's related to that problem. (seen in the logs)

Location:
branches/stable/mondo/mondo
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • branches/stable/mondo/mondo/mondorestore/mondo-rstr-tools.c

    r681 r691  
    469469        strcat(mount_isodir_command, " -o ro ");
    470470        strcat(mount_isodir_command, bkpinfo->isodir);
    471         run_program_and_log_output("df -P -m", FALSE);
     471        run_program_and_log_output("df -m", FALSE);
    472472        sprintf(tmp,
    473473                "The 'mount' command is '%s'. PLEASE report this command to be if you have problems, ok?",
     
    653653    }
    654654    close_progress_form();
    655     run_program_and_log_output("df -P -m", TRUE);
     655    run_program_and_log_output("df -m", TRUE);
    656656    if (retval) {
    657657        if (g_partition_table_locked_up > 0) {
     
    679679        mvaddstr_and_log_it(g_currentY++, 74, "Done.");
    680680    }
    681     run_program_and_log_output("df -P -m", 3);
     681    run_program_and_log_output("df -m", 3);
    682682    paranoid_free(mountlist);
    683683    paranoid_free(tmp);
     
    948948                               FALSE);
    949949    run_program_and_log_output("cd " MNT_RESTORING
    950                                "; for i in `ls home/`; do echo \"Moving $i's spurious files to $i/.disabled\"; mkdir $i/.disabled ; mv -f $i/.DCOP* $i/.MCOP* $i/.*authority $i/.kde/tmp* $i/.kde/socket* $i/.disabled/ ; done",
     950                               "; for i in `ls home/`; do echo \"Moving $i's spurious files to $i/.disabled\"; mkdir \"$i\"/.disabled ; mv -f \"$i\"/.DCOP* \"$i\"/.MCOP* \"$i\"/.*authority \"$i\"/.kde/tmp* \"$i\"/.kde/socket* \"$i\"/.disabled/ ; done",
    951951                               TRUE);
    952952    run_program_and_log_output("rm -f " MNT_RESTORING "/var/run/*.pid",
     
    21682168    sort_mountlist_by_mountpoint(mountlist, 0);
    21692169
    2170     run_program_and_log_output("df -P -m", 3);
     2170    run_program_and_log_output("df -m", 3);
    21712171    mvaddstr_and_log_it(g_currentY, 0, "Unmounting devices      ");
    21722172    open_progress_form("Unmounting devices",
  • branches/stable/mondo/mondo/restore-scripts/mondo/grub-install.patched

    r567 r691  
    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
  • branches/stable/mondo/mondo/restore-scripts/mondo/label-partitions-as-necessary

    r567 r691  
    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.