Changeset 3318 for branches/3.2


Ignore:
Timestamp:
Dec 1, 2014, 11:35:37 PM (5 years ago)
Author:
bruno
Message:
  • Redirect the stderr of parted2fdisk into /dev/null to avoid error msgs on LVM, even if some are redirected in mondo log files and won't disappear
Location:
branches/3.2/mondo/src
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • branches/3.2/mondo/src/common/libmondo-devices.c

    r3309 r3318  
    26662666        mr_free(tmp);
    26672667// NTFS
    2668         strcpy(tmp1, call_program_and_get_last_line_of_output("parted2fdisk -l | grep -i ntfs | awk '{ print $1};' | tr -s '\\n' ' ' | awk '{ print $0};'"));
     2668        strcpy(tmp1, call_program_and_get_last_line_of_output("parted2fdisk -l 2>/dev/null | grep -i ntfs | awk '{ print $1};' | tr -s '\\n' ' ' | awk '{ print $0};'"));
    26692669        if (strlen(tmp1) > 2) {
    26702670            if (!popup_and_get_string("NTFS partitions", "Please enter/confirm the NTFS partitions you wish to backup as well.", tmp1, MAX_STR_LEN / 4)) {
     
    32743274    malloc_string(fdisk);
    32753275    sprintf(fdisk, "/sbin/parted2fdisk");
    3276     sprintf(command, "%s -l %s | grep 'EFI GPT'", fdisk, drive);
     3276    sprintf(command, "%s -l %s 2>/dev/null | grep 'EFI GPT'", fdisk, drive);
    32773277    mr_asprintf(tmp, "%s", call_program_and_get_last_line_of_output(command));
    32783278    if (strstr(tmp, "GPT") == NULL) {
  • branches/3.2/mondo/src/common/libmondo-tools.c

    r3292 r3318  
    363363    assert(bkpinfo != NULL);
    364364
    365     bkpinfo->optimal_set_size = (IS_THIS_A_STREAMING_BACKUP(bkpinfo->backup_media_type) ? 16 : 16) * 1024;
     365    bkpinfo->optimal_set_size = (IS_THIS_A_STREAMING_BACKUP(bkpinfo->backup_media_type) ? 16 : 16) * 1024L;
    366366
    367367    log_msg(1, "Post-param");
     
    803803    }
    804804    strcpy(bkpinfo->prefix, STD_PREFIX);
    805     bkpinfo->optimal_set_size = 0;
     805    bkpinfo->optimal_set_size = 0L;
    806806    bkpinfo->backup_media_type = none;
    807807    bkpinfo->make_filelist = TRUE;  // unless -J supplied to mondoarchive
  • branches/3.2/mondo/src/restore-scripts/mondo/format-and-kludge-vfat

    r2186 r3318  
    2828    device=$1
    2929    drive=$2
    30     ftype=`parted2fdisk -l $drive | grep $device | tr '*' ' ' | tr -s '\t' ' ' | cut -d' ' -f5`
     30    ftype=`parted2fdisk -l $drive 2>/dev/null | grep $device | tr '*' ' ' | tr -s '\t' ' ' | cut -d' ' -f5`
    3131    case $ftype in
    3232#   "b" | "c")
  • branches/3.2/mondo/src/restore-scripts/mondo/grub-MR

    r3047 r3318  
    169169    line=`grep $base /proc/mdstat | head -n1`
    170170    echo "mbrdev was $mbrdev" 2>&1 | tee -a $LOGFILE
    171     mbrdev=`parted2fdisk -l | grep /dev/ | head -n1 | tr ':' ' ' | cut -d' ' -f2`
     171    mbrdev=`parted2fdisk -l 2>/dev/null | grep /dev/ | head -n1 | tr ':' ' ' | cut -d' ' -f2`
    172172    echo "mbrdev is $mbrdev" 2>&1 | tee -a $LOGFILE
    173173    partno="0"; # cheating - FIXME   
  • branches/3.2/mondo/src/restore-scripts/mondo/make-me-bootable

    r3071 r3318  
    1717dummy="$3"
    1818
    19 activepart=`parted2fdisk -l $drivetouse | tr -s '\t' ' ' | grep "$drivetouse" | grep '*' | cut -d' ' -f1`
     19activepart=`parted2fdisk -l $drivetouse 2>/dev/null | tr -s '\t' ' ' | grep "$drivetouse" | grep '*' | cut -d' ' -f1`
    2020
    2121for i in `cat $1 | tr -s '\t' ' ' | cut -d' ' -f1 | grep -vE "/dev/fd|none|#"` ; do
Note: See TracChangeset for help on using the changeset viewer.